Browse Source

Fix mangling of direct json_pointer access

6.0.7
Jon Evans 5 years ago
parent
commit
4f3674bd1d
  1. 2
      common/settings/color_settings.cpp
  2. 5
      include/settings/json_settings_internals.h

2
common/settings/color_settings.cpp

@ -270,7 +270,7 @@ bool COLOR_SETTINGS::MigrateFromLegacy( wxConfigBase* aCfg )
return false;
}
#include <iostream>
bool COLOR_SETTINGS::migrateSchema0to1()
{
/**

5
include/settings/json_settings_internals.h

@ -58,6 +58,11 @@ public:
return at( PointerFromString( aPath ) );
}
nlohmann::json& operator[]( const nlohmann::json::json_pointer& aPointer )
{
return nlohmann::json::operator[]( aPointer );
}
nlohmann::json& operator[]( const std::string& aPath )
{
return nlohmann::json::operator[]( PointerFromString( aPath ) );

Loading…
Cancel
Save