Skip to content

Commit 36552f0

Browse files
committed
remove namespace macros
1 parent 8659e7d commit 36552f0

File tree

134 files changed

+533
-277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+533
-277
lines changed

doc/Jamfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ docca.reference reference.qbk
3535
BOOST_JSON_PUBLIC \\
3636
BOOST_SYMBOL_VISIBLE \\
3737
\"BOOST_JSON_INLINE_VARIABLE(v, t)=constexpr t v;\" \\
38-
\"BOOST_JSON_NODISCARD=[[nodiscard]]\" \\
39-
\"BOOST_JSON_NS_BEGIN=namespace boost { namespace json {\" \\
40-
\"BOOST_JSON_NS_END=}}\""
38+
\"BOOST_JSON_NODISCARD=[[nodiscard]]\""
4139
<doxygen:param>ABBREVIATE_BRIEF=
4240
<doxygen:param>INLINE_INHERITED_MEMB=YES
4341
<doxygen:param>JAVADOC_AUTOBRIEF=YES

include/boost/json/array.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
#include <initializer_list>
2020
#include <iterator>
2121

22-
BOOST_JSON_NS_BEGIN
22+
namespace boost {
23+
namespace json {
2324

2425
#ifndef BOOST_JSON_DOCS
2526
class value;
@@ -1739,7 +1740,8 @@ class array
17391740
equal(array const& other) const noexcept;
17401741
};
17411742

1742-
BOOST_JSON_NS_END
1743+
} // namespace json
1744+
} // namespace boost
17431745

17441746
// std::hash specialization
17451747
#ifndef BOOST_JSON_DOCS

include/boost/json/basic_parser.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
times down.
3232
*/
3333

34-
BOOST_JSON_NS_BEGIN
34+
namespace boost {
35+
namespace json {
3536

3637
/** An incremental SAX parser for serialized JSON.
3738
@@ -722,6 +723,7 @@ class basic_parser
722723
/** @} */
723724
};
724725

725-
BOOST_JSON_NS_END
726+
} // namespace json
727+
} // namespace boost
726728

727729
#endif

include/boost/json/basic_parser_impl.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242

4343
#ifndef BOOST_JSON_DOCS
4444

45-
BOOST_JSON_NS_BEGIN
45+
namespace boost {
46+
namespace json {
4647
namespace detail {
4748

4849
inline
@@ -2791,7 +2792,8 @@ write_some(
27912792

27922793
#endif
27932794

2794-
BOOST_JSON_NS_END
2795+
} // namespace json
2796+
} // namespace boost
27952797

27962798
#ifdef _MSC_VER
27972799
#pragma warning(pop)

include/boost/json/conversion.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414

1515
#include <type_traits>
1616

17-
BOOST_JSON_NS_BEGIN
17+
namespace boost {
18+
namespace json {
1819

1920
/** Customization point tag.
2021
@@ -322,7 +323,8 @@ struct is_described_class;
322323
template<class T>
323324
struct is_described_enum;
324325

325-
BOOST_JSON_NS_END
326+
} // namespace json
327+
} // namespace boost
326328

327329
#include <boost/json/impl/conversion.hpp>
328330

include/boost/json/detail/align.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212

1313
#include <boost/align/align.hpp>
1414

15-
BOOST_JSON_NS_BEGIN
15+
namespace boost {
16+
namespace json {
1617
namespace detail {
1718

1819
using boost::alignment::align;
@@ -59,6 +60,7 @@ struct max_align_t
5960
};
6061

6162
} // detail
62-
BOOST_JSON_NS_END
63+
} // namespace json
64+
} // namespace boost
6365

6466
#endif

include/boost/json/detail/array.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
#include <boost/json/storage_ptr.hpp>
1515
#include <cstddef>
1616

17-
BOOST_JSON_NS_BEGIN
17+
namespace boost {
18+
namespace json {
1819

1920
class value;
2021

@@ -68,7 +69,8 @@ class unchecked_array
6869

6970
} // detail
7071

71-
BOOST_JSON_NS_END
72+
} // namespace json
73+
} // namespace boost
7274

7375
// includes are at the bottom of <boost/json/value.hpp>
7476

include/boost/json/detail/buffer.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
#include <boost/json/string_view.hpp>
1515
#include <cstring>
1616

17-
BOOST_JSON_NS_BEGIN
17+
namespace boost {
18+
namespace json {
1819
namespace detail {
1920

2021
// A simple string-like temporary static buffer
@@ -139,6 +140,7 @@ class buffer
139140
};
140141

141142
} // detail
142-
BOOST_JSON_NS_END
143+
} // namespace json
144+
} // namespace boost
143145

144146
#endif

include/boost/json/detail/config.hpp

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,6 @@
134134
#define BOOST_SYMBOL_VISIBLE
135135
#endif
136136

137-
#if ! defined(BOOST_JSON_DOCS)
138-
# define BOOST_JSON_NS_BEGIN \
139-
namespace boost { \
140-
namespace json {
141-
# define BOOST_JSON_NS_END } }
142-
#endif
143-
144137
#if defined(BOOST_JSON_DOCS)
145138
# define BOOST_JSON_DECL
146139
#else
@@ -269,7 +262,8 @@
269262
# endif
270263
#endif
271264

272-
BOOST_JSON_NS_BEGIN
265+
namespace boost {
266+
namespace json {
273267
namespace detail {
274268

275269
template<class...>
@@ -320,6 +314,7 @@ constexpr T static_const<T>::value;
320314
} struct _unused_ ## name ## _semicolon_bait_
321315

322316
} // detail
323-
BOOST_JSON_NS_END
317+
} // namespace json
318+
} // namespace boost
324319

325320
#endif

include/boost/json/detail/default_resource.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
#include <boost/json/detail/config.hpp>
1414
#include <new>
1515

16-
BOOST_JSON_NS_BEGIN
16+
namespace boost {
17+
namespace json {
1718
namespace detail {
1819

1920
#ifdef _MSC_VER
@@ -94,6 +95,7 @@ union default_resource::
9495
};
9596

9697
} // detail
97-
BOOST_JSON_NS_END
98+
} // namespace json
99+
} // namespace boost
98100

99101
#endif

0 commit comments

Comments
 (0)