Merge branch 'main' into update_cli11_from_2.3.2_to_2.4.2

microsoft · Jan 8, 2025 · 1985eb5 · 1985eb5
2 parents f44c6be + 7f720b7
commit 1985eb5
Show file tree

Hide file tree

Showing 36 changed files with 2,865 additions and 477 deletions.
diff --git a/3rdparty/internal/valijson/adapters/boost_json_adapter.hpp b/3rdparty/internal/valijson/adapters/boost_json_adapter.hpp
@@ -29,9 +29,9 @@
 
 #include <boost/json.hpp>
 
-#include <valijson/adapters/adapter.hpp>
-#include <valijson/adapters/basic_adapter.hpp>
-#include <valijson/adapters/frozen_value.hpp>
+#include <valijson/internal/adapter.hpp>
+#include <valijson/internal/basic_adapter.hpp>
+#include <valijson/internal/frozen_value.hpp>
 
 namespace valijson {
 namespace adapters {
@@ -485,12 +485,16 @@ class BoostJsonAdapter:
 {
 public:
 
+    // deleted to avoid holding references to temporaries
+    BoostJsonAdapter(boost::json::array &) = delete;
+    BoostJsonAdapter(boost::json::object &) = delete;
+
     /// Construct a BoostJsonAdapter that contains an empty object
     BoostJsonAdapter()
       : BasicAdapter() { }
 
     /// Construct a BoostJsonAdapter using a specific Boost.JSON value
-    BoostJsonAdapter(const boost::json::value &value)
+    explicit BoostJsonAdapter(const boost::json::value &value)
       : BasicAdapter(value) { }
 };
 

diff --git a/3rdparty/internal/valijson/adapters/json11_adapter.hpp b/3rdparty/internal/valijson/adapters/json11_adapter.hpp
@@ -28,9 +28,9 @@
 #include <string>
 #include <json11.hpp>
 
-#include <valijson/adapters/adapter.hpp>
-#include <valijson/adapters/basic_adapter.hpp>
-#include <valijson/adapters/frozen_value.hpp>
+#include <valijson/internal/adapter.hpp>
+#include <valijson/internal/basic_adapter.hpp>
+#include <valijson/internal/frozen_value.hpp>
 #include <valijson/exceptions.hpp>
 
 namespace valijson {

diff --git a/3rdparty/internal/valijson/adapters/jsoncpp_adapter.hpp b/3rdparty/internal/valijson/adapters/jsoncpp_adapter.hpp
@@ -31,9 +31,9 @@
 
 #include <json/json.h>
 
-#include <valijson/adapters/adapter.hpp>
-#include <valijson/adapters/basic_adapter.hpp>
-#include <valijson/adapters/frozen_value.hpp>
+#include <valijson/internal/adapter.hpp>
+#include <valijson/internal/basic_adapter.hpp>
+#include <valijson/internal/frozen_value.hpp>
 #include <valijson/exceptions.hpp>
 
 namespace valijson {