haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mangling of direct json_pointer access

This commit is contained in:
Jon Evans 2021-07-05 12:33:08 -04:00
parent 3f55093bff
commit 4f3674bd1d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/settings/color_settings.cpp
View File

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

5
include/settings/json_settings_internals.h
View File

@ -58,6 +58,11 @@ public:
return at( PointerFromString( aPath ) ); 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 ) nlohmann::json& operator[]( const std::string& aPath )
{ {
return nlohmann::json::operator[]( PointerFromString( aPath ) ); return nlohmann::json::operator[]( PointerFromString( aPath ) );