Fixed wrong behaviour for normal non polymorphic classes.

Author: 5cript

parse/jsd_smart_ptr.h

@@ -9,13 +9,13 @@ namespace JSON
 {
     namespace internal
     {
-        template <typename T, bool ClassType, bool Enabler>
+        template <typename T, bool ClassType, bool Poly>
         struct smart_pointer_parser
         {
         };
 
         template <typename T>
-        struct smart_pointer_parser <T, true, true>
+        struct smart_pointer_parser <T, true, false>
         {
             static void get(T& value, std::string const& name, PropertyTree const& object, ParsingOptions const& options)
             {
@@ -25,7 +25,7 @@ namespace JSON
         };
 
         template <typename T>
-        struct smart_pointer_parser <T, false, true>
+        struct smart_pointer_parser <T, false, false>
         {
             static void get(T& value, std::string const& name, PropertyTree const& object, ParsingOptions const& options)
             {
@@ -36,7 +36,7 @@ namespace JSON
         };
 
         template <typename T>
-        struct smart_pointer_parser <T, true, false>
+        struct smart_pointer_parser <T, true, true>
         {
             static void get(T& value, std::string const& name, PropertyTree const& object, ParsingOptions const& options)
             {
@@ -73,7 +73,7 @@ namespace JSON
         };
 
         template <typename T>
-        struct smart_pointer_parser <T, false, false>
+        struct smart_pointer_parser <T, false, true>
         {
             static void get(T& value, std::string const& name, PropertyTree const& object, ParsingOptions const& options)
             {
@@ -88,14 +88,13 @@ namespace JSON
         {
 
             using element_type = typename std::decay<decltype(value)>::type::element_type;
-            using polydecl_type = polydecls <element_type>;
 
             internal::smart_pointer_parser <T,
                                             std::is_class <element_type>::value,
-                                            std::is_same <typename polydecl_type::type, no_poly>::value>::get(value,
-                                                                                                              name,
-                                                                                                              object,
-                                                                                                              options);
+                                            is_polydecl <element_type>::value>::get(value,
+                                                                                    name,
+                                                                                    object,
+                                                                                    options);
         }
     }
 }

stringify/jss_smart_ptr.h

@@ -14,6 +14,8 @@ namespace JSON
         {
             static void exec(std::ostream& stream, const std::string& name, T const& value, StringificationOptions const& options)
             {
+                if (options.in_object && !options.ignore_name)
+                    WRITE_NAME(stream);
                 value->stringify(stream, options);
             }
         };
@@ -24,6 +26,8 @@ namespace JSON
             static void exec(std::ostream& stream, const std::string& name, T const& value, StringificationOptions const& options)
             {
                 //value->stringify(stream, options);
+                if (options.in_object && !options.ignore_name)
+                    WRITE_NAME(stream);
                 polydecls <typename T::element_type>::smart_pointer_set(value, stream, options);
             }
         };
@@ -40,15 +44,12 @@ namespace JSON
         template <typename T>
         std::ostream& stringify_smart_ptr(std::ostream& stream, const std::string& name, T const& value, StringificationOptions const& options = {})
         {
-            if (options.in_object && !options.ignore_name)
-                WRITE_NAME(stream);
-
             using element_type = typename std::decay<decltype(value)>::type::element_type;
 
             internal::smart_pointer_stringifier <
                 typename std::decay<decltype(value)>::type,
                 std::is_class <element_type>::value,
-                !std::is_same <element_type, no_poly>::value
+                is_polydecl <element_type>::value
             >::exec(stream, name, value, options);
             return stream;
         }

utility/polymorphy.h

@@ -25,11 +25,12 @@ namespace JSON
     struct polydecls
     {
         using type = no_poly;
+    };
 
-        static std::string identify_type(T const*)
-        {
-            return "SimpleJson_internal_error";
-        }
+    template <typename T>
+    struct is_polydecl
+    {
+        static constexpr bool const value = !std::is_same <typename polydecls <T>::type, no_poly>::value;
     };
 
     template <typename BaseT, typename PackT>