to_json .value fixes

Author: zajo

include/boost/leaf/serialize.hpp

@@ -233,12 +233,6 @@ struct ostream_writer::diagnostic<Enum, true, false, false, false, true>
 
 ////////////////////////////////////////
 
-template <class Json, class E>
-auto to_json(Json & j, E const & e) -> decltype(to_json(j, e.value), void())
-{
-    j["value"] = e.value;
-}
-
 #if BOOST_LEAF_CFG_STD_SYSTEM_ERROR
 template <class Json>
 void to_json(Json & j, std::error_code const & ec)
@@ -296,6 +290,12 @@ void to_json(Json & j, std::exception_ptr const & ep)
     }
 }
 
+template <class Json, class E>
+auto to_json(Json & j, E const & e) -> decltype(to_json(j, e.value), void())
+{
+    to_json(j["value"], e.value);
+}
+
 template <class Json, class E, class = void>
 struct has_to_json: std::false_type { };
 

test/json_test.cpp

@@ -70,6 +70,13 @@ void serialize(writer & w, E const & e)
 
 } } // namespace boost::leaf
 
+struct my_exception { };
+
+struct my_exception_ptr
+{
+    std::exception_ptr value;
+};
+
 template <int N>
 struct my_error
 {
@@ -110,8 +117,6 @@ void leaf_throw()
         std::make_error_code(std::errc::invalid_argument) );
 }
 
-struct my_exception { };
-
 void throw_()
 {
     auto load = leaf::on_error(
@@ -312,17 +317,17 @@ int main()
         leaf::try_handle_all(
             []() -> leaf::result<void>
             {
-                return leaf::new_error(std::make_exception_ptr(std::runtime_error("test exception")));
+                return leaf::new_error(my_exception_ptr{std::make_exception_ptr(std::runtime_error("test exception"))});
             },
-            [&j](leaf::diagnostic_details const & dd, std::exception_ptr *)
+            [&j](leaf::diagnostic_details const & dd, my_exception_ptr *)
             {
                 nlohmann_writer w(j, dd.error());
                 dd.write_to(w);
             }
         );
         std::cout << "std::exception_ptr JSON output:\n" << std::setw(2) << j << std::endl;
 
-        auto const & ep = j["std::exception_ptr"];
+        auto const & ep = j["my_exception_ptr"]["value"];
         std::string type = ep["typeid.name"].get<std::string>();
         std::string what = ep["what"].get<std::string>();
         BOOST_TEST(type.find("std::runtime_error") != std::string::npos);
@@ -334,17 +339,17 @@ int main()
         leaf::try_handle_all(
             []() -> leaf::result<void>
             {
-                return leaf::new_error(std::make_exception_ptr(42));
+                return leaf::new_error(my_exception_ptr{std::make_exception_ptr(42)});
             },
-            [&j](leaf::diagnostic_details const & dd, std::exception_ptr *)
+            [&j](leaf::diagnostic_details const & dd, my_exception_ptr *)
             {
                 nlohmann_writer w(j, dd.error());
                 dd.write_to(w);
             }
         );
         std::cout << "non-std::exception_ptr JSON output:\n" << std::setw(2) << j << std::endl;
 
-        auto const & ep = j["std::exception_ptr"];
+        auto const & ep = j["my_exception_ptr"]["value"];
         std::string type = ep["typeid.name"].get<std::string>();
         std::string what = ep["what"].get<std::string>();
         BOOST_TEST_EQ(type, "<<unknown>>");