migrated helper to include/nlohmann/detail/conversions/from_json.hpp

Signed-off-by: Ash-Jose <[email protected]>

Author: Ash-Jose

include/nlohmann/detail/conversions/from_json.hpp

@@ -29,6 +29,16 @@
 #include <nlohmann/detail/string_concat.hpp>
 #include <nlohmann/detail/value_t.hpp>
 
+/* helper for strict enum error reporting */
+template<typename BasicJsonType>
+inline void throw_enum_error(const BasicJsonType& j, const char* enum_type)
+{
+    JSON_THROW(::nlohmann::detail::type_error::create(
+                   302,
+                   std::string("invalid value for ") + enum_type + ": " + j.dump(),
+                   &j));
+}
+
 // include after macro_scope.hpp
 #ifdef JSON_HAS_CPP_17
     #include <optional> // optional

include/nlohmann/detail/macro_scope.hpp

@@ -260,16 +260,6 @@
 @since version 3.12.0
 */
 
-/* helper for strict enum error reporting */
-template<typename BasicJsonType>
-inline void throw_enum_error(const BasicJsonType& j, const char* enum_type)
-{
-    JSON_THROW(::nlohmann::detail::type_error::create(
-                   302,
-                   std::string("invalid value for ") + enum_type + ": " + j.dump(),
-                   &j));
-}
-
 #define NLOHMANN_JSON_SERIALIZE_ENUM_STRICT(ENUM_TYPE, ...)                                     \
     template<typename BasicJsonType>                                                            \
     inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \

single_include/nlohmann/json.hpp

@@ -2624,16 +2624,6 @@ JSON_HEDLEY_DIAGNOSTIC_POP
 @since version 3.12.0
 */
 
-/* helper for strict enum error reporting */
-template<typename BasicJsonType>
-inline void throw_enum_error(const BasicJsonType& j, const char* enum_type)
-{
-    JSON_THROW(::nlohmann::detail::type_error::create(
-                   302,
-                   std::string("invalid value for ") + enum_type + ": " + j.dump(),
-                   &j));
-}
-
 #define NLOHMANN_JSON_SERIALIZE_ENUM_STRICT(ENUM_TYPE, ...)                                     \
     template<typename BasicJsonType>                                                            \
     inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
@@ -4914,6 +4904,16 @@ NLOHMANN_JSON_NAMESPACE_END
 // #include <nlohmann/detail/value_t.hpp>
 
 
+/* helper for strict enum error reporting */
+template<typename BasicJsonType>
+inline void throw_enum_error(const BasicJsonType& j, const char* enum_type)
+{
+    JSON_THROW(::nlohmann::detail::type_error::create(
+                   302,
+                   std::string("invalid value for ") + enum_type + ": " + j.dump(),
+                   &j));
+}
+
 // include after macro_scope.hpp
 #ifdef JSON_HAS_CPP_17
     #include <optional> // optional