Merge branch 'develop' of github.com:gracicot/json into develop

nlohmann · Jun 4, 2018 · 14e6278 · 14e6278
2 parents 7acd90b + 5676a2a
commit 14e6278
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/include/nlohmann/detail/conversions/to_json.hpp b/include/nlohmann/detail/conversions/to_json.hpp
@@ -51,6 +51,16 @@ struct external_constructor<value_t::string>
         j.m_value = std::move(s);
         j.assert_invariant();
     }
+
+	template<typename BasicJsonType, typename CompatibleStringType,
+		 enable_if_t<not std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
+		             int> = 0>
+		static void construct(BasicJsonType& j, const CompatibleStringType& str)
+	{
+		j.m_type = value_t::string;
+		j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
+		j.assert_invariant();
+	}
 };
 
 template<>

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -1320,6 +1320,16 @@ struct external_constructor<value_t::string>
         j.m_value = std::move(s);
         j.assert_invariant();
     }
+
+    template<typename BasicJsonType, typename CompatibleStringType,
+             enable_if_t<not std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
+                         int> = 0>
+    static void construct(BasicJsonType& j, const CompatibleStringType& str)
+    {
+        j.m_type = value_t::string;
+        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
+        j.assert_invariant();
+    }
 };
 
 template<>