remove namespace macros

doc/Jamfile

@@ -35,9 +35,7 @@ docca.reference reference.qbk
             BOOST_JSON_PUBLIC \\
             BOOST_SYMBOL_VISIBLE \\
             \"BOOST_JSON_INLINE_VARIABLE(v, t)=constexpr t v;\" \\
-            \"BOOST_JSON_NODISCARD=[[nodiscard]]\" \\
-            \"BOOST_JSON_NS_BEGIN=namespace boost { namespace json {\" \\
-            \"BOOST_JSON_NS_END=}}\""
+            \"BOOST_JSON_NODISCARD=[[nodiscard]]\""
         <doxygen:param>ABBREVIATE_BRIEF=
         <doxygen:param>INLINE_INHERITED_MEMB=YES
         <doxygen:param>JAVADOC_AUTOBRIEF=YES

include/boost/json/array.hpp

@@ -19,7 +19,8 @@
 #include <initializer_list>
 #include <iterator>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 #ifndef BOOST_JSON_DOCS
 class value;
@@ -1739,7 +1740,8 @@ private:
     equal(array const& other) const noexcept;
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 // std::hash specialization
 #ifndef BOOST_JSON_DOCS

include/boost/json/basic_parser.hpp

@@ -31,7 +31,8 @@
     times down.
 */
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** An incremental SAX parser for serialized JSON.
 
@@ -722,6 +723,7 @@ public:
 /** @} */
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/basic_parser_impl.hpp

@@ -42,7 +42,8 @@
 
 #ifndef BOOST_JSON_DOCS
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 inline
@@ -2791,7 +2792,8 @@ write_some(
 
 #endif
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #ifdef _MSC_VER
 #pragma warning(pop)

include/boost/json/conversion.hpp

@@ -14,7 +14,8 @@
 
 #include <type_traits>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Customization point tag.
 
@@ -322,7 +323,8 @@ struct is_described_class;
 template<class T>
 struct is_described_enum;
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #include <boost/json/impl/conversion.hpp>
 

include/boost/json/detail/align.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/align/align.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 using boost::alignment::align;
@@ -59,6 +60,7 @@ struct max_align_t
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/array.hpp

@@ -14,7 +14,8 @@
 #include <boost/json/storage_ptr.hpp>
 #include <cstddef>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class value;
 
@@ -68,7 +69,8 @@ public:
 
 } // detail
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 // includes are at the bottom of <boost/json/value.hpp>
 

include/boost/json/detail/buffer.hpp

@@ -14,7 +14,8 @@
 #include <boost/json/string_view.hpp>
 #include <cstring>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 // A simple string-like temporary static buffer
@@ -139,6 +140,7 @@ private:
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/config.hpp

@@ -134,13 +134,6 @@
 #define BOOST_SYMBOL_VISIBLE
 #endif
 
-#if ! defined(BOOST_JSON_DOCS)
-# define BOOST_JSON_NS_BEGIN \
-    namespace boost { \
-    namespace json {
-# define BOOST_JSON_NS_END } }
-#endif
-
 #if defined(BOOST_JSON_DOCS)
 # define BOOST_JSON_DECL
 #else
@@ -269,7 +262,8 @@
 # endif
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 template<class...>
@@ -320,6 +314,7 @@ constexpr T static_const<T>::value;
     } struct _unused_ ## name ## _semicolon_bait_
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/default_resource.hpp

@@ -13,7 +13,8 @@
 #include <boost/json/detail/config.hpp>
 #include <new>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 #ifdef _MSC_VER
@@ -94,6 +95,7 @@ union default_resource::
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/digest.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_DETAIL_DIGEST_HPP
 #define BOOST_JSON_DETAIL_DIGEST_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 // Calculate salted digest of string
@@ -35,6 +36,7 @@ digest(
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/except.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/json/error.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 #define BOOST_JSON_FAIL(ec, e) \
@@ -26,6 +27,7 @@ BOOST_JSON_DECL void BOOST_NORETURN throw_out_of_range(source_location const& lo
 BOOST_JSON_DECL void BOOST_NORETURN throw_system_error(error_code const& ec, source_location const& loc);
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/format.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_DETAIL_FORMAT_HPP
 #define BOOST_JSON_DETAIL_FORMAT_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 int constexpr max_number_chars =
@@ -37,6 +38,7 @@ format_double(
     char* dest, double d) noexcept;
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/handler.hpp

@@ -17,7 +17,8 @@
 #include <boost/json/string.hpp>
 #include <boost/json/value_stack.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 struct handler
@@ -61,6 +62,7 @@ struct handler
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/impl/array.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_DETAIL_IMPL_ARRAY_HPP
 #define BOOST_JSON_DETAIL_IMPL_ARRAY_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 unchecked_array::
@@ -36,6 +37,7 @@ relocate(value* dest) noexcept
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/impl/default_resource.ipp

@@ -12,7 +12,8 @@
 
 #include <boost/json/detail/default_resource.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 #ifndef BOOST_JSON_WEAK_CONSTINIT
@@ -61,6 +62,7 @@ do_is_equal(
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/impl/except.ipp

@@ -15,7 +15,8 @@
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace detail {
 
@@ -69,6 +70,7 @@ throw_system_error(
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/impl/format.ipp

@@ -14,7 +14,8 @@
 #include <boost/json/detail/ryu/ryu.hpp>
 #include <cstring>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 /*  Reference work:
@@ -118,6 +119,7 @@ format_double(
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/impl/handler.ipp

@@ -13,7 +13,8 @@
 #include <boost/json/detail/handler.hpp>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 template<class... Args>
@@ -197,6 +198,7 @@ on_comment(
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/impl/shared_resource.ipp

@@ -12,7 +12,8 @@
 
 #include <boost/json/detail/shared_resource.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 // these are here so that ~memory_resource
@@ -30,6 +31,7 @@ shared_resource::
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/impl/stack.ipp

@@ -12,7 +12,8 @@
 
 #include <boost/json/detail/stack.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 stack::
@@ -42,6 +43,7 @@ reserve(std::size_t n)
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/impl/string_impl.ipp

@@ -16,7 +16,8 @@
 #include <cstring>
 #include <functional>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 inline
@@ -466,6 +467,7 @@ shrink_to_fit(
 }
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/object.hpp

@@ -14,7 +14,8 @@
 #include <boost/json/string_view.hpp>
 #include <cstdlib>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class object;
 class value;
@@ -89,6 +90,7 @@ find_in_object<string_view>(
     string_view key) noexcept;
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/ryu/detail/common.hpp

@@ -25,7 +25,8 @@
 #include <boost/json/detail/config.hpp>
 #include <string.h>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -113,6 +114,7 @@ inline uint64_t double_to_bits(const double d) {
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/ryu/detail/d2s.hpp

@@ -35,7 +35,8 @@ typedef __uint128_t uint128_t;
 #include <boost/json/detail/ryu/detail/d2s_intrinsics.hpp>
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -257,6 +258,7 @@ double_computeInvPow5(
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/ryu/detail/d2s_full_table.hpp

@@ -24,7 +24,8 @@
 
 #include <boost/json/detail/config.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -358,6 +359,7 @@ std::uint64_t const
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/ryu/detail/d2s_intrinsics.hpp

@@ -31,7 +31,8 @@
 #include <intrin.h>
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -224,6 +225,7 @@ inline bool multipleOfPowerOf2(const uint64_t value, const uint32_t p) {
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/ryu/detail/digit_table.hpp

@@ -24,7 +24,8 @@
 
 #include <boost/json/detail/config.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -54,6 +55,7 @@ char const
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/ryu/impl/d2s.ipp

@@ -55,7 +55,8 @@
 #include <boost/json/detail/ryu/detail/d2s.hpp>
 #include <boost/json/detail/ryu/detail/d2s_intrinsics.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -719,6 +720,7 @@ d2s_buffered_n(
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/ryu/ryu.hpp

@@ -24,7 +24,8 @@
 
 #include <boost/json/detail/config.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 namespace ryu {
@@ -35,6 +36,7 @@ int d2s_buffered_n(double f, char* result) noexcept;
 } // ryu
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/shared_resource.hpp

@@ -14,7 +14,8 @@
 #include <atomic>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 #ifdef _MSC_VER
@@ -80,6 +81,7 @@ public:
 #endif
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/sse2.hpp

@@ -24,7 +24,8 @@
 # endif
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 #ifdef BOOST_JSON_USE_SSE2
@@ -542,6 +543,7 @@ inline const char* count_whitespace( char const* p, const char* end ) noexcept
 #endif
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/stack.hpp

@@ -14,7 +14,8 @@
 #include <boost/json/storage_ptr.hpp>
 #include <cstring>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 class stack
@@ -94,6 +95,7 @@ public:
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/stream.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_DETAIL_STREAM_HPP
 #define BOOST_JSON_DETAIL_STREAM_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 class const_stream
@@ -340,6 +341,7 @@ public:
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/string_impl.hpp

@@ -18,7 +18,8 @@
 #include <algorithm>
 #include <iterator>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class value;
 class string;
@@ -378,6 +379,7 @@ using string_comp_op_requirement
         bool>::type;
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/utf8.hpp

@@ -16,7 +16,8 @@
 #include <cstring>
 #include <cstdint>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 template<int N>
@@ -192,6 +193,7 @@ public:
 };
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/value.hpp

@@ -17,7 +17,8 @@
 #include <new>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 struct key_t
@@ -276,6 +277,7 @@ std::size_t
 hash_value_impl( value const& jv ) noexcept;
 
 } // detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/value_from.hpp

@@ -20,7 +20,8 @@
 # include <optional>
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace detail {
 
@@ -296,6 +297,7 @@ tag_invoke(
 }
 #endif // BOOST_NO_CXX17_HDR_VARIANT
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/detail/value_to.hpp

@@ -20,7 +20,8 @@
 # include <optional>
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template<class T, class U,
     typename std::enable_if<
@@ -761,6 +762,7 @@ tag_invoke(
 }
 #endif // BOOST_NO_CXX17_HDR_VARIANT
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/error.hpp

@@ -13,7 +13,8 @@
 #include <boost/json/detail/config.hpp>
 #include <boost/json/system_error.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Error codes returned by JSON operations
 
@@ -156,7 +157,8 @@ enum class condition
     generic_error,
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #include <boost/json/impl/error.hpp>
 

include/boost/json/fwd.hpp

@@ -13,7 +13,8 @@
 
 #include <boost/json/detail/config.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 // Forward declarations
 
@@ -75,6 +76,7 @@ result_from_errno( int e, boost::source_location const* loc ) noexcept;
 
 #endif
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/array.hpp

@@ -16,7 +16,8 @@
 #include <stdexcept>
 #include <type_traits>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -583,6 +584,7 @@ insert(
     return r.commit();
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/array.ipp

@@ -19,7 +19,8 @@
 #include <new>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -751,7 +752,8 @@ equal(
     return true;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 //----------------------------------------------------------
 //

include/boost/json/impl/conversion.hpp

@@ -26,7 +26,8 @@
 # include <variant>
 #endif // BOOST_NO_CXX17_HDR_VARIANT
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 #ifdef __cpp_lib_nonmember_container_access
@@ -321,6 +322,7 @@ struct is_described_enum
     : describe::has_describe_enumerators<T>
 { };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif // BOOST_JSON_IMPL_CONVERSION_HPP

include/boost/json/impl/error.hpp

@@ -40,7 +40,8 @@ struct is_error_condition_enum< ::boost::json::condition >
 };
 } // std
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 BOOST_JSON_DECL
 error_code
@@ -50,6 +51,7 @@ BOOST_JSON_DECL
 error_condition
 make_error_condition(condition c);
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/error.ipp

@@ -12,7 +12,8 @@
 
 #include <boost/json/error.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 error_code
 make_error_code(error e)
@@ -168,6 +169,7 @@ make_error_condition(condition c)
         std::underlying_type<condition>::type>(c), cat};
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/kind.ipp

@@ -13,7 +13,8 @@
 #include <boost/json/kind.hpp>
 #include <ostream>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 string_view
 to_string(kind k) noexcept
@@ -39,6 +40,7 @@ operator<<(std::ostream& os, kind k)
     return os;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/monotonic_resource.ipp

@@ -17,7 +17,8 @@
 
 #include <memory>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 struct alignas(detail::max_align_t)
     monotonic_resource::block : block_base
@@ -166,6 +167,7 @@ do_is_equal(
     return this == &mr;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/null_resource.ipp

@@ -13,7 +13,8 @@
 #include <boost/json/null_resource.hpp>
 #include <boost/json/detail/except.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace detail {
 
@@ -96,6 +97,7 @@ get_null_resource() noexcept
     return &mr;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/object.hpp

@@ -16,7 +16,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace detail {
 
@@ -533,6 +534,7 @@ unchecked_object::
 
 } // detail
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/object.ipp

@@ -22,7 +22,8 @@
 #include <stdexcept>
 #include <type_traits>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 namespace detail {
 
 template<class CharRange>
@@ -889,7 +890,8 @@ reindex_relocate(
         index_t>(dst - begin());
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 //----------------------------------------------------------
 //

include/boost/json/impl/parse.ipp

@@ -17,7 +17,8 @@
 
 #include <istream>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 value
 parse(
@@ -131,6 +132,7 @@ parse(
     return jv;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/parser.ipp

@@ -17,7 +17,8 @@
 #include <stdexcept>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 parser::
 parser(
@@ -161,6 +162,7 @@ release()
     return p_.handler().st.release();
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/pointer.ipp

@@ -12,7 +12,8 @@
 
 #include <boost/json/value.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace detail {
 
@@ -494,6 +495,7 @@ value::set_at_pointer(
     return *result;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif // BOOST_JSON_IMPL_POINTER_IPP

include/boost/json/impl/serialize.ipp

@@ -14,7 +14,8 @@
 #include <boost/json/serializer.hpp>
 #include <ostream>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 static
 void
@@ -191,6 +192,7 @@ operator<<(
     return os;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/serializer.ipp

@@ -20,7 +20,8 @@
 #pragma warning(disable: 4127) // conditional expression is constant
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 enum class serializer::state : char
 {
@@ -813,7 +814,8 @@ read(char* dest, std::size_t size)
     return read_some(dest, size);
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #ifdef _MSC_VER
 #pragma warning(pop)

include/boost/json/impl/static_resource.ipp

@@ -15,7 +15,8 @@
 #include <boost/json/detail/except.hpp>
 #include <memory>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 static_resource::
 ~static_resource() noexcept = default;
@@ -73,6 +74,7 @@ do_is_equal(
     return this == &mr;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/stream_parser.ipp

@@ -17,7 +17,8 @@
 #include <stdexcept>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 stream_parser::
 stream_parser(
@@ -178,6 +179,7 @@ release()
     return p_.handler().st.release();
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/string.hpp

@@ -12,7 +12,8 @@
 
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 string::
 string(
@@ -237,6 +238,7 @@ append(
         tmp.data(), tmp.size());
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/string.ipp

@@ -18,7 +18,8 @@
 #include <string>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 //
@@ -413,7 +414,8 @@ reserve_impl(size_type new_cap)
     }
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 //----------------------------------------------------------
 

include/boost/json/impl/value.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_IMPL_VALUE_HPP
 #define BOOST_JSON_IMPL_VALUE_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 value&
 value::at_pointer(string_view ptr) &
@@ -25,6 +26,7 @@ value::at_pointer(string_view ptr) &&
     return std::move( this->at_pointer(ptr) );
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif // BOOST_JSON_IMPL_VALUE_HPP

include/boost/json/impl/value.ipp

@@ -19,7 +19,8 @@
 #include <new>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 namespace
 {
@@ -620,7 +621,8 @@ hash_value_impl( value const& jv ) noexcept
 }
 
 } // namespace detail
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 //----------------------------------------------------------
 //

include/boost/json/impl/value_ref.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_IMPL_VALUE_REF_HPP
 #define BOOST_JSON_IMPL_VALUE_REF_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template<class T>
 value
@@ -51,6 +52,7 @@ from_rvalue(
         std::move(sp));
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/value_ref.ipp

@@ -14,7 +14,8 @@
 #include <boost/json/array.hpp>
 #include <boost/json/value.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 value_ref::
 operator
@@ -182,6 +183,7 @@ write_array(
     u.pos = nullptr;
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/value_stack.ipp

@@ -15,7 +15,8 @@
 #include <stdexcept>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //--------------------------------------
 
@@ -467,6 +468,7 @@ push_null()
     st_.push(nullptr, sp_);
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/impl/visit.hpp

@@ -10,7 +10,8 @@
 #ifndef BOOST_JSON_IMPL_VISIT_HPP
 #define BOOST_JSON_IMPL_VISIT_HPP
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 template<class Visitor>
 auto
@@ -54,6 +55,7 @@ visit(
     }
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/kind.hpp

@@ -14,7 +14,8 @@
 #include <boost/json/string_view.hpp>
 #include <iosfwd>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Constants for identifying the type of a value
 
@@ -158,6 +159,7 @@ BOOST_JSON_INLINE_VARIABLE(object_kind, object_kind_t);
 */
 BOOST_JSON_INLINE_VARIABLE(string_kind, string_kind_t);
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/memory_resource.hpp

@@ -15,7 +15,8 @@
 #include <boost/container/pmr/memory_resource.hpp>
 #include <boost/container/pmr/polymorphic_allocator.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 #ifdef BOOST_JSON_DOCS
 
@@ -101,6 +102,7 @@ struct is_deallocate_trivial
     static constexpr bool value = false;
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/monotonic_resource.hpp

@@ -17,7 +17,8 @@
 #include <cstddef>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 #ifdef _MSC_VER
 #pragma warning(push)
@@ -345,6 +346,7 @@ struct is_deallocate_trivial<
     static constexpr bool value = true;
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/null_resource.hpp

@@ -13,7 +13,8 @@
 #include <boost/json/detail/config.hpp>
 #include <boost/json/memory_resource.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Return a pointer to the null resource.
 
@@ -30,6 +31,7 @@ BOOST_JSON_DECL
 memory_resource*
 get_null_resource() noexcept;
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/object.hpp

@@ -23,7 +23,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class value;
 class value_ref;
@@ -1648,7 +1649,8 @@ private:
         key_value_pair* dst) noexcept;
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #ifndef BOOST_JSON_DOCS
 // boost::hash trait

include/boost/json/parse.hpp

@@ -18,7 +18,8 @@
 #include <boost/json/string_view.hpp>
 #include <boost/json/value.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Return parsed JSON as a @ref value.
 
@@ -199,6 +200,7 @@ parse(
     storage_ptr sp = {},
     parse_options const& opt = {});
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/parse_options.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/json/detail/config.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Parser options
 
@@ -78,6 +79,7 @@ struct parse_options
     bool allow_invalid_utf8 = false;
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/parser.hpp

@@ -18,7 +18,8 @@
 #include <type_traits>
 #include <cstddef>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -822,6 +823,7 @@ public:
     release();
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/serialize.hpp

@@ -15,7 +15,8 @@
 #include <iosfwd>
 #include <string>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Return a string representing a serialized element.
 
@@ -55,6 +56,7 @@ std::string
 serialize(string_view t);
 /** @} */
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/serializer.hpp

@@ -16,7 +16,8 @@
 #include <boost/json/detail/stack.hpp>
 #include <boost/json/detail/stream.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** A serializer for JSON.
 
@@ -285,6 +286,7 @@ public:
 #endif
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/set_pointer_options.hpp

@@ -12,7 +12,8 @@
 
 #include <boost/json/detail/config.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Options for @ref value::set_at_pointer
  *
@@ -59,7 +60,7 @@ struct set_pointer_options
     std::size_t max_created_elements = 1;
 };
 
-
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif // BOOST_JSON_SET_POINTER_OPTIONS_HPP

include/boost/json/static_resource.hpp

@@ -14,7 +14,8 @@
 #include <boost/json/memory_resource.hpp>
 #include <cstddef>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 #ifdef _MSC_VER
 #pragma warning(push)
@@ -238,6 +239,7 @@ struct is_deallocate_trivial<
     static constexpr bool value = true;
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/storage_ptr.hpp

@@ -19,7 +19,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** A smart pointer to a @ref memory_resource
 
@@ -533,6 +534,7 @@ operator!=(
     return lhs.get() != rhs.get();
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/stream_parser.hpp

@@ -19,7 +19,8 @@
 #include <type_traits>
 #include <cstddef>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -1026,6 +1027,7 @@ public:
     release();
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/string.hpp

@@ -29,7 +29,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 class value;
 
@@ -2902,7 +2903,8 @@ operator>(T const& lhs, U const& rhs) noexcept
     return detail::to_string_view(lhs) > detail::to_string_view(rhs);
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 // std::hash specialization
 #ifndef BOOST_JSON_DOCS

include/boost/json/string_view.hpp

@@ -17,7 +17,8 @@
 # include <string_view>
 #endif
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 #ifdef BOOST_JSON_DOCS
 
@@ -46,6 +47,7 @@ using is_string_viewish = typename std::enable_if<
 
 } // detail
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/system_error.hpp

@@ -18,7 +18,8 @@
 #include <boost/system/result.hpp>
 #include <boost/system/system_error.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /// The type of error code used by the library.
 using error_code = boost::system::error_code;
@@ -218,6 +219,7 @@ result_from_errno(int e, boost::source_location const* loc) noexcept
     return {system::in_place_error, ec};
 }
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/value.hpp

@@ -32,7 +32,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -4191,7 +4192,8 @@ get<1>(key_value_pair&& kvp) noexcept
 
 #endif
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #ifdef __clang__
 # pragma clang diagnostic push

include/boost/json/value_from.hpp

@@ -14,7 +14,8 @@
 
 #include <boost/json/detail/value_from.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Convert an object of type `T` to @ref value.
 
@@ -140,6 +141,7 @@ using has_value_from = detail::can_convert<
     detail::remove_cvref<T>, detail::value_from_conversion>;
 #endif
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/value_ref.hpp

@@ -17,7 +17,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 #ifndef BOOST_JSON_DOCS
 class value;
@@ -464,7 +465,8 @@ private:
         storage_ptr const& sp);
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 // Must be included here for this file to stand alone
 #include <boost/json/value.hpp>

include/boost/json/value_stack.hpp

@@ -16,7 +16,8 @@
 #include <boost/json/value.hpp>
 #include <stddef.h>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 //----------------------------------------------------------
 
@@ -503,6 +504,7 @@ public:
     push_null();
 };
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/value_to.hpp

@@ -14,7 +14,8 @@
 
 #include <boost/json/detail/value_to.hpp>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Convert a @ref value to an object of type `T`.
 
@@ -168,6 +169,7 @@ using has_value_to = detail::can_convert<
     detail::remove_cvref<T>, detail::value_to_conversion>;
 #endif
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #endif

include/boost/json/visit.hpp

@@ -15,7 +15,8 @@
 #include <type_traits>
 #include <utility>
 
-BOOST_JSON_NS_BEGIN
+namespace boost {
+namespace json {
 
 /** Invoke a function object with the contents of a @ref value
 
@@ -41,7 +42,8 @@ visit(
         std::declval<Visitor>()(nullptr));
 /** @} */
 
-BOOST_JSON_NS_END
+} // namespace json
+} // namespace boost
 
 #include <boost/json/impl/visit.hpp>
 

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