Merge pull request #1062 from simdjson/jkeiser/reamalgamate

Fix C++ 20 compilation

include/simdjson/dom/array.h

@@ -177,13 +177,16 @@ inline std::ostream& operator<<(std::ostream& out, const simdjson_result<dom::ar
 #if defined(__cpp_lib_ranges)
 #include <ranges>
 
-namespace std::ranges {
+namespace std {
+namespace ranges {
 template<>
 inline constexpr bool enable_view<simdjson::dom::array> = true;
-}
+#if SIMDJSON_EXCEPTIONS
-
+template<>
-static_assert(std::ranges::view<simdjson::dom::array>);
+inline constexpr bool enable_view<simdjson::simdjson_result<simdjson::dom::array>> = true;
-static_assert(std::ranges::sized_range<simdjson::dom::array>);
+#endif // SIMDJSON_EXCEPTIONS
-#endif
+} // namespace ranges
+} // namespace std
+#endif // defined(__cpp_lib_ranges)
 
 #endif // SIMDJSON_DOM_ARRAY_H

include/simdjson/dom/object.h

@@ -284,13 +284,16 @@ inline std::ostream& operator<<(std::ostream& out, const simdjson_result<dom::ob
 #if defined(__cpp_lib_ranges)
 #include <ranges>
 
-namespace std::ranges {
+namespace std {
+namespace ranges {
 template<>
 inline constexpr bool enable_view<simdjson::dom::object> = true;
-}
+#if SIMDJSON_EXCEPTIONS
-
+template<>
-static_assert(std::ranges::view<simdjson::dom::object>);
+inline constexpr bool enable_view<simdjson::simdjson_result<simdjson::dom::object>> = true;
-static_assert(std::ranges::sized_range<simdjson::dom::object>);
+#endif // SIMDJSON_EXCEPTIONS
-#endif
+} // namespace ranges
+} // namespace std
+#endif // defined(__cpp_lib_ranges)
 
 #endif // SIMDJSON_DOM_OBJECT_H

include/simdjson/inline/array.h

@@ -169,4 +169,15 @@ inline std::ostream& operator<<(std::ostream& out, const simdjson_result<dom::ar
 
 } // namespace simdjson
 
+#include "simdjson/inline/element.h"
+
+#if defined(__cpp_lib_ranges)
+static_assert(std::ranges::view<simdjson::dom::array>);
+static_assert(std::ranges::sized_range<simdjson::dom::array>);
+#if SIMDJSON_EXCEPTIONS
+static_assert(std::ranges::view<simdjson::simdjson_result<simdjson::dom::array>>);
+static_assert(std::ranges::sized_range<simdjson::simdjson_result<simdjson::dom::array>>);
+#endif // SIMDJSON_EXCEPTIONS
+#endif // defined(__cpp_lib_ranges)
+
 #endif // SIMDJSON_INLINE_ARRAY_H

include/simdjson/inline/object.h

@@ -272,4 +272,13 @@ inline std::ostream& operator<<(std::ostream& out, const simdjson_result<dom::ob
 
 } // namespace simdjson
 
+#if defined(__cpp_lib_ranges)
+static_assert(std::ranges::view<simdjson::dom::object>);
+static_assert(std::ranges::sized_range<simdjson::dom::object>);
+#if SIMDJSON_EXCEPTIONS
+static_assert(std::ranges::view<simdjson::simdjson_result<simdjson::dom::object>>);
+static_assert(std::ranges::sized_range<simdjson::simdjson_result<simdjson::dom::object>>);
+#endif // SIMDJSON_EXCEPTIONS
+#endif // defined(__cpp_lib_ranges)
+
 #endif // SIMDJSON_INLINE_OBJECT_H

singleheader/amalgamate_demo.cpp

@@ -1,4 +1,4 @@
-/* auto-generated on Tue 21 Jul 2020 17:54:23 EDT. Do not edit! */
+/* auto-generated on Tue Aug  4 13:10:22 PDT 2020. Do not edit! */
 
 #include <iostream>
 #include "simdjson.h"