Merge branch 'nlohmann:develop' into issue5210

ljcjclljc · web-flow · commit 0b2cc97f6839 · 2026-06-18T10:31:56.000+08:00
diff --git a/include/nlohmann/detail/conversions/from_json.hpp b/include/nlohmann/detail/conversions/from_json.hpp
@@ -558,6 +558,11 @@ inline void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Has
 }
 
 #if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+
+// Workaround for MSVC 19.51 (and possibly later): in large in large cpp files, the compiler may fail to resolve with generic has_from_json (issue #4996)
+template<typename BasicJsonType>
+struct has_from_json<BasicJsonType, std_fs::path, void> : std::true_type {};
+
 template<typename BasicJsonType>
 inline void from_json(const BasicJsonType& j, std_fs::path& p)
 {
diff --git a/include/nlohmann/detail/conversions/to_json.hpp b/include/nlohmann/detail/conversions/to_json.hpp
@@ -450,6 +450,10 @@ inline void to_json(BasicJsonType& j, const std::basic_string<char8_t, Tr, Alloc
 }
 #endif
 
+// Workaround for MSVC 19.51 (and possibly later): in large cpp files, the compiler may fail to resolve with generic has_to_json (issue #4996)
+template<typename BasicJsonType>
+struct has_to_json<BasicJsonType, std_fs::path, void> : std::true_type {};
+
 template<typename BasicJsonType>
 inline void to_json(BasicJsonType& j, const std_fs::path& p)
 {
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -5668,6 +5668,11 @@ inline void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Has
 }
 
 #if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+
+// Workaround for MSVC 19.51 (and possibly later): in large in large cpp files, the compiler may fail to resolve with generic has_from_json (issue #4996)
+template<typename BasicJsonType>
+struct has_from_json<BasicJsonType, std_fs::path, void> : std::true_type {};
+
 template<typename BasicJsonType>
 inline void from_json(const BasicJsonType& j, std_fs::path& p)
 {
@@ -6451,6 +6456,10 @@ inline void to_json(BasicJsonType& j, const std::basic_string<char8_t, Tr, Alloc
 }
 #endif
 
+// Workaround for MSVC 19.51 (and possibly later): in large cpp files, the compiler may fail to resolve with generic has_to_json (issue #4996)
+template<typename BasicJsonType>
+struct has_to_json<BasicJsonType, std_fs::path, void> : std::true_type {};
+
 template<typename BasicJsonType>
 inline void to_json(BasicJsonType& j, const std_fs::path& p)
 {

Original file line number	Diff line number	Diff line change
`@@ -558,6 +558,11 @@ inline void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Has`
`558`	`558`	`}`
`559`	`559`
`560`	`560`	`#if JSON_HAS_FILESYSTEM \|\| JSON_HAS_EXPERIMENTAL_FILESYSTEM`
	`561`	`+`
	`562`	`+// Workaround for MSVC 19.51 (and possibly later): in large in large cpp files, the compiler may fail to resolve with generic has_from_json (issue #4996)`
	`563`	`+template<typename BasicJsonType>`
	`564`	`+struct has_from_json<BasicJsonType, std_fs::path, void> : std::true_type {};`
	`565`	`+`
`561`	`566`	`template<typename BasicJsonType>`
`562`	`567`	`inline void from_json(const BasicJsonType& j, std_fs::path& p)`
`563`	`568`	`{`
Original file line number	Diff line number	Diff line change
`@@ -450,6 +450,10 @@ inline void to_json(BasicJsonType& j, const std::basic_string<char8_t, Tr, Alloc`
`450`	`450`	`}`
`451`	`451`	`#endif`
`452`	`452`
	`453`	`+// Workaround for MSVC 19.51 (and possibly later): in large cpp files, the compiler may fail to resolve with generic has_to_json (issue #4996)`
	`454`	`+template<typename BasicJsonType>`
	`455`	`+struct has_to_json<BasicJsonType, std_fs::path, void> : std::true_type {};`
	`456`	`+`
`453`	`457`	`template<typename BasicJsonType>`
`454`	`458`	`inline void to_json(BasicJsonType& j, const std_fs::path& p)`
`455`	`459`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5668,6 +5668,11 @@ inline void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Has`
`5668`	`5668`	`}`
`5669`	`5669`
`5670`	`5670`	`#if JSON_HAS_FILESYSTEM \|\| JSON_HAS_EXPERIMENTAL_FILESYSTEM`
	`5671`	`+`
	`5672`	`+// Workaround for MSVC 19.51 (and possibly later): in large in large cpp files, the compiler may fail to resolve with generic has_from_json (issue #4996)`
	`5673`	`+template<typename BasicJsonType>`
	`5674`	`+struct has_from_json<BasicJsonType, std_fs::path, void> : std::true_type {};`
	`5675`	`+`
`5671`	`5676`	`template<typename BasicJsonType>`
`5672`	`5677`	`inline void from_json(const BasicJsonType& j, std_fs::path& p)`
`5673`	`5678`	`{`
`@@ -6451,6 +6456,10 @@ inline void to_json(BasicJsonType& j, const std::basic_string<char8_t, Tr, Alloc`
`6451`	`6456`	`}`
`6452`	`6457`	`#endif`
`6453`	`6458`
	`6459`	`+// Workaround for MSVC 19.51 (and possibly later): in large cpp files, the compiler may fail to resolve with generic has_to_json (issue #4996)`
	`6460`	`+template<typename BasicJsonType>`
	`6461`	`+struct has_to_json<BasicJsonType, std_fs::path, void> : std::true_type {};`
	`6462`	`+`
`6454`	`6463`	`template<typename BasicJsonType>`
`6455`	`6464`	`inline void to_json(BasicJsonType& j, const std_fs::path& p)`
`6456`	`6465`	`{`