From 4f3674bd1d1f4152e92a50a743a8e9bbc598d00c Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Mon, 5 Jul 2021 12:33:08 -0400
Subject: [PATCH] Fix mangling of direct json_pointer access
---
common/settings/color_settings.cpp | 2 +-
include/settings/json_settings_internals.h | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/common/settings/color_settings.cpp b/common/settings/color_settings.cpp
index e615b2517d..1f56735484 100644
--- a/common/settings/color_settings.cpp
+++ b/common/settings/color_settings.cpp
@@ -270,7 +270,7 @@ bool COLOR_SETTINGS::MigrateFromLegacy( wxConfigBase* aCfg )
return false;
}
-#include <iostream>
+
bool COLOR_SETTINGS::migrateSchema0to1()
{
/**
diff --git a/include/settings/json_settings_internals.h b/include/settings/json_settings_internals.h
index ff1b55c3c7..d34f46d14c 100644
--- a/include/settings/json_settings_internals.h
+++ b/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 ) );