remove namespace macros

test/array.cpp

@@ -19,7 +19,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<array>::value );
 BOOST_STATIC_ASSERT( std::is_nothrow_move_constructible<array>::value );
@@ -1355,4 +1356,5 @@ public:
 
 TEST_SUITE(array_test, "boost.json.array");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/basic_parser.cpp

@@ -19,7 +19,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<basic_parser<int>>::value );
 
@@ -1606,4 +1607,5 @@ public:
 
 TEST_SUITE(basic_parser_test, "boost.json.basic_parser");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/checking_resource.hpp

@@ -15,7 +15,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class checking_resource
     : public memory_resource
@@ -58,6 +59,7 @@ private:
     }
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif // BOOST_JSON_CHECKING_RESOURCE_HPP

test/conversion.cpp

@@ -136,7 +136,8 @@ struct tuple_size<pseudo_tuple1> : std::integral_constant<std::size_t, 2>
 
 } // namespace std
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template <>
 struct is_string_like<pseudo_string2> : std::false_type
@@ -216,4 +217,5 @@ public:
 
 TEST_SUITE(conversion_test, "boost.json.conversion");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/doc_background.cpp

@@ -20,7 +20,8 @@
 #endif
 #define assert BOOST_TEST
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace doc_background {
 
@@ -202,4 +203,5 @@ public:
 
 TEST_SUITE(doc_background_test, "boost.json.doc_background");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/doc_forward_conversion.cpp

@@ -91,7 +91,8 @@ tag_invoke(
 #include "test_suite.hpp"
 
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class doc_forward_conversion
 {
@@ -113,4 +114,5 @@ public:
 
 TEST_SUITE(doc_forward_conversion, "boost.json.doc_forward_conversion");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/doc_parsing.cpp

@@ -19,7 +19,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -251,4 +252,5 @@ public:
 
 TEST_SUITE(doc_parsing_test, "boost.json.doc_parsing");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/doc_quick_look.cpp

@@ -13,7 +13,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 static void set1() {
 
@@ -330,4 +331,5 @@ public:
 
 TEST_SUITE(doc_quick_look_test, "boost.json.doc_quick_look");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/doc_serializing.cpp

@@ -14,7 +14,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -72,4 +73,5 @@ public:
 
 TEST_SUITE(doc_serializing_test, "boost.json.doc_serializing");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/doc_storage_ptr.cpp

@@ -17,7 +17,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -173,4 +174,5 @@ public:
 
 TEST_SUITE(doc_storage_ptr_test, "boost.json.doc_storage_ptr");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/doc_uses_allocator.cpp

@@ -14,7 +14,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -74,4 +75,5 @@ public:
 
 TEST_SUITE(doc_uses_allocator_test, "boost.json.doc_uses_allocator");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/doc_using_numbers.cpp

@@ -27,7 +27,8 @@
 # pragma GCC diagnostic ignored "-Wunused-variable"
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -183,4 +184,5 @@ public:
 
 TEST_SUITE(doc_using_numbers_test, "boost.json.doc_using_numbers");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/double.cpp

@@ -20,7 +20,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template<std::size_t N, class... Args>
 void
@@ -431,4 +432,5 @@ public:
 
 TEST_SUITE(double_test, "boost.json.double");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/error.cpp

@@ -14,7 +14,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class error_test
 {
@@ -94,4 +95,5 @@ public:
 
 TEST_SUITE(error_test, "boost.json.error");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/json.cpp

@@ -12,7 +12,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 struct json_test
 {
@@ -37,4 +38,5 @@ struct json_test
 
 TEST_SUITE(json_test, "boost.json.zsizes");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/kind.cpp

@@ -16,7 +16,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class kind_test
 {
@@ -50,4 +51,5 @@ public:
 
 TEST_SUITE(kind_test, "boost.json.kind");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/limits.cpp

@@ -19,7 +19,8 @@
 #include "test_suite.hpp"
 #include "test.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /*
     This translation unit exercises code paths
@@ -397,4 +398,5 @@ public:
 
 TEST_SUITE(limits_test, "boost.json.limits");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/memory_resource.cpp

@@ -16,7 +16,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class memory_resource_test
 {
@@ -106,4 +107,5 @@ public:
 
 TEST_SUITE(memory_resource_test, "boost.json.memory_resource");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/monotonic_resource.cpp

@@ -19,7 +19,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<monotonic_resource>::value );
 
@@ -308,4 +309,5 @@ R"xx({
 
 TEST_SUITE(monotonic_resource_test, "boost.json.monotonic_resource");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/natvis.cpp

@@ -14,7 +14,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class natvis_test
 {
@@ -112,4 +113,5 @@ public:
 
 TEST_SUITE(natvis_test, "json.natvis");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/null_resource.cpp

@@ -14,7 +14,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class null_resource_test
 {
@@ -42,4 +43,5 @@ public:
 
 TEST_SUITE(null_resource_test, "boost.json.null_resource");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/object.cpp

@@ -25,7 +25,8 @@
 #include "test_suite.hpp"
 #include "checking_resource.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<object>::value );
 BOOST_STATIC_ASSERT( std::is_nothrow_move_constructible<object>::value );
@@ -1617,4 +1618,5 @@ public:
 
 TEST_SUITE(object_test, "boost.json.object");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/parse-vectors.hpp

@@ -15,7 +15,8 @@
 #include <cstdlib>
 #include <type_traits>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 struct parse_vectors
 {
@@ -1465,6 +1466,7 @@ parse_vectors() noexcept
         decltype(list)>::value - 1];
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

test/parse.cpp

@@ -18,7 +18,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class parse_test
 {
@@ -215,4 +216,5 @@ public:
 
 TEST_SUITE(parse_test, "boost.json.parse");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/parser.cpp

@@ -12,7 +12,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class parser_test
 {
@@ -392,4 +393,5 @@ public:
 
 TEST_SUITE(parser_test, "boost.json.parser");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/pointer.cpp

@@ -11,7 +11,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class pointer_test
 {
@@ -363,4 +364,5 @@ public:
 
 TEST_SUITE(pointer_test, "boost.json.pointer");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/ryu/d2s_intrinsics_test.cpp

@@ -23,7 +23,8 @@
 #include "gtest.hpp"
 #include <math.h>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -53,4 +54,5 @@ TEST(D2sIntrinsicsTest, mod1e9) {
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/ryu/d2s_table_test.cpp

@@ -37,7 +37,8 @@
 #include <cmath>
 #include "gtest.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -103,4 +104,5 @@ TEST(D2sTableTest, compute_offsets_for_double_computeInvPow5) {
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/ryu/d2s_test.cpp

@@ -25,7 +25,8 @@
 #include <limits>
 #include "gtest.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -280,4 +281,5 @@ TEST(D2sTest, SmallIntegers) {
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/serialize.cpp

@@ -16,7 +16,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class serialize_test
 {
@@ -65,4 +66,5 @@ public:
 
 TEST_SUITE(serialize_test, "boost.json.serialize");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/serializer.cpp

@@ -18,7 +18,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<serializer>::value );
 
@@ -562,4 +563,5 @@ public:
 
 TEST_SUITE(serializer_test, "boost.json.serializer");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/snippets.cpp

@@ -111,7 +111,8 @@ tag_invoke( const try_value_to_tag< ip_address >&, value const& jv )
 
 } // namespace user_ns
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace {
 
@@ -871,4 +872,5 @@ public:
 
 TEST_SUITE(snippets_test, "boost.json.snippets");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/static_resource.cpp

@@ -16,7 +16,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<static_resource>::value );
 
@@ -126,4 +127,5 @@ public:
 
 TEST_SUITE(static_resource_test, "boost.json.static_resource");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/storage_ptr.cpp

@@ -22,7 +22,8 @@
 #pragma warning(disable: 4702) // unreachable code
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT(
     std::is_nothrow_move_constructible<storage_ptr>::value);
@@ -207,7 +208,8 @@ value storage_ptr_test::jv2 = {1, 2, 3};
 
 TEST_SUITE(storage_ptr_test, "boost.json.storage_ptr");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #ifdef _MSC_VER
 #pragma warning(pop)

test/stream_parser.cpp

@@ -23,7 +23,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<stream_parser>::value );
 
@@ -1296,4 +1297,5 @@ R"xx({
 
 TEST_SUITE(stream_parser_test, "boost.json.stream_parser");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/string.cpp

@@ -22,7 +22,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<string>::value );
 BOOST_STATIC_ASSERT( std::is_nothrow_move_constructible<string>::value );
@@ -2823,4 +2824,5 @@ public:
 
 TEST_SUITE(string_test, "boost.json.string");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/test.hpp

@@ -24,7 +24,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -1139,6 +1140,7 @@ check_array(
 
 //----------------------------------------------------------
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

test/unhygenic_macros.cpp

@@ -22,7 +22,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class unhygenic_macros_test
 {
@@ -35,4 +36,5 @@ public:
 
 TEST_SUITE(unhygenic_macros_test, "boost.json.unhygenic_macros");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/utf8.cpp

@@ -12,7 +12,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class utf8_test
 {
@@ -174,4 +175,5 @@ public:
 
 TEST_SUITE(utf8_test, "boost.json.utf8");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/value.cpp

@@ -19,7 +19,8 @@
 #include "test.hpp"
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<value>::value );
 BOOST_STATIC_ASSERT( std::is_nothrow_move_constructible<value>::value );
@@ -2339,4 +2340,5 @@ public:
 
 TEST_SUITE(value_test, "boost.json.value");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/value_from.cpp

@@ -210,7 +210,8 @@ check(
     }
 }
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template<>
 struct is_null_like<::value_from_test_ns::T7>
@@ -492,4 +493,5 @@ public:
 
 TEST_SUITE(value_from_test, "boost.json.value_from");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/value_ref.cpp

@@ -15,7 +15,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -401,4 +402,5 @@ public:
 
 TEST_SUITE(value_ref_test, "boost.json.value_ref");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/value_stack.cpp

@@ -15,7 +15,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_STATIC_ASSERT( std::is_nothrow_destructible<value_stack>::value );
 
@@ -124,4 +125,5 @@ public:
 
 TEST_SUITE(value_stack_test, "boost.json.value_stack");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/value_to.cpp

@@ -144,7 +144,8 @@ struct tuple_size<value_to_test_ns::T4>
 
 } // namespace std
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template<>
 struct is_null_like<::value_to_test_ns::T1> : std::true_type { };
@@ -617,4 +618,5 @@ public:
 
 TEST_SUITE(value_to_test, "boost.json.value_to");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost

test/visit.cpp

@@ -12,7 +12,8 @@
 
 #include "test_suite.hpp"
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class visit_test
 {
@@ -89,4 +90,5 @@ public:
 
 TEST_SUITE(visit_test, "boost.json.visit");
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost