Skip to content

Commit 9f8b738

Browse files
eramongodberamongodb
committed
Use consistent prefix for private macros used in public headers
1 parent ba4797f commit 9f8b738

File tree

36 files changed

+329
-323
lines changed

36 files changed

+329
-323
lines changed

‎.clang-format

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ AttributeMacros:
8383
- BSONCXX_ABI_NO_EXPORT
8484
- BSONCXX_DEPRECATED
8585
- BSONCXX_ENUM
86-
- BSONCXX_PRAGMA
87-
- BSONCXX_RETURNS
86+
- BSONCXX_PRIVATE_PRAGMA
87+
- BSONCXX_PRIVATE_RETURNS
8888
- MONGOCXX_ABI_CDECL
8989
- MONGOCXX_ABI_EXPORT
9090
- MONGOCXX_ABI_NO_EXPORT
@@ -294,14 +294,14 @@ SpacesInSquareBrackets: false
294294
Standard: Cpp11
295295
StatementAttributeLikeMacros: []
296296
StatementMacros:
297-
- BSONCXX_DISABLE_WARNING
298-
- BSONCXX_FORCE_SEMICOLON
299-
- BSONCXX_IF_CLANG
300-
- BSONCXX_IF_GCC
301-
- BSONCXX_IF_GNU_LIKE
302-
- BSONCXX_IF_MSVC
303-
- BSONCXX_POP_WARNINGS
304-
- BSONCXX_PUSH_WARNINGS
297+
- BSONCXX_PRIVATE_FORCE_SEMICOLON
298+
- BSONCXX_PRIVATE_IF_CLANG
299+
- BSONCXX_PRIVATE_IF_GCC
300+
- BSONCXX_PRIVATE_IF_GNU_LIKE
301+
- BSONCXX_PRIVATE_IF_MSVC
302+
- BSONCXX_PRIVATE_WARNINGS_DISABLE
303+
- BSONCXX_PRIVATE_WARNINGS_POP
304+
- BSONCXX_PRIVATE_WARNINGS_PUSH
305305
- BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_BEGIN
306306
- BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_END
307307
TableGenBreakInsideDAGArg: DontBreak

‎examples/bsoncxx/getting_values.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ int EXAMPLES_CDECL main() {
7272
auto invalid1 = doc["name"]["middle"];
7373
auto invalid2 = doc["contribs"][1000];
7474
if (invalid1 || invalid2) {
75-
BSONCXX_UNREACHABLE; // Not reached.
75+
return EXIT_FAILURE; // Not reached.
7676
}
7777

7878
// Similarly, indexed access (either by string or numeric index) into a type that is not
@@ -81,7 +81,7 @@ int EXAMPLES_CDECL main() {
8181
auto invalid3 = doc["_id"]["invalid"];
8282
auto invalid4 = doc["name"][3];
8383
if (invalid3 || invalid4) {
84-
BSONCXX_UNREACHABLE; // Not reached.
84+
return EXIT_FAILURE; // Not reached.
8585
}
8686

8787
// Values are accessed through get_*() methods.

‎src/bsoncxx/include/bsoncxx/v1/detail/compare.hpp

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ namespace detail {
2929
template <typename L, typename R>
3030
auto is_equality_comparable_f(...) -> std::false_type;
3131

32-
BSONCXX_PUSH_WARNINGS();
33-
BSONCXX_DISABLE_WARNING(GNU("-Wfloat-equal"));
32+
BSONCXX_PRIVATE_WARNINGS_PUSH();
33+
BSONCXX_PRIVATE_WARNINGS_DISABLE(GNU("-Wfloat-equal"));
3434
template <typename L, typename R>
3535
auto is_equality_comparable_f(int, bool b = false)
3636
-> true_t<
3737
decltype((std::declval<L const&>() == std::declval<R const&>()) ? 0 : 0, (std::declval<R const&>() == std::declval<L const&>()) ? 0 : 0, (std::declval<L const&>() != std::declval<R const&>()) ? 0 : 0, (std::declval<R const&>() != std::declval<L const&>()) ? 0 : 0)>;
38-
BSONCXX_POP_WARNINGS();
38+
BSONCXX_PRIVATE_WARNINGS_POP();
3939

4040
// Detect whether two types are equality-comparable.
4141
//
@@ -55,21 +55,21 @@ struct equal_to {
5555
// an ADL-only tag_invoke(equal_to, l, r).
5656
class equality_operators {
5757
template <typename L, typename R>
58-
constexpr static auto impl(rank<1>, L& l, R& r) BSONCXX_RETURNS(tag_invoke(equal_to{}, l, r));
58+
constexpr static auto impl(rank<1>, L& l, R& r) BSONCXX_PRIVATE_RETURNS(tag_invoke(equal_to{}, l, r));
5959

6060
template <typename L, typename R>
61-
constexpr static auto impl(rank<0>, L& l, R& r) BSONCXX_RETURNS(tag_invoke(equal_to{}, r, l));
61+
constexpr static auto impl(rank<0>, L& l, R& r) BSONCXX_PRIVATE_RETURNS(tag_invoke(equal_to{}, r, l));
6262

6363
// @cond DOXYGEN_DISABLE "Found ';' while parsing initializer list!"
6464
template <typename Left, typename Other>
6565
constexpr friend auto operator==(Left const& self, Other const& other)
66-
BSONCXX_RETURNS(equality_operators::impl(rank<1>{}, self, other));
66+
BSONCXX_PRIVATE_RETURNS(equality_operators::impl(rank<1>{}, self, other));
6767
// @endcond
6868

6969
// @cond DOXYGEN_DISABLE "Found ';' while parsing initializer list!"
7070
template <typename Left, typename Other>
7171
constexpr friend auto operator!=(Left const& self, Other const& other)
72-
BSONCXX_RETURNS(!equality_operators::impl(rank<1>{}, self, other));
72+
BSONCXX_PRIVATE_RETURNS(!equality_operators::impl(rank<1>{}, self, other));
7373
// @endcond
7474
};
7575

@@ -117,9 +117,9 @@ class strong_ordering {
117117

118118
#pragma push_macro("INLINE_VAR")
119119
#undef INLINE_VAR
120-
#define INLINE_VAR \
121-
BSONCXX_IF_GNU_LIKE([[gnu::weak]]) \
122-
BSONCXX_IF_MSVC(__declspec(selectany))
120+
#define INLINE_VAR \
121+
BSONCXX_PRIVATE_IF_GNU_LIKE([[gnu::weak]]) \
122+
BSONCXX_PRIVATE_IF_MSVC(__declspec(selectany))
123123

124124
INLINE_VAR const strong_ordering strong_ordering::less = strong_ordering(strong_ordering::_construct{}, -1);
125125
INLINE_VAR const strong_ordering strong_ordering::greater = strong_ordering(strong_ordering::_construct{}, 1);
@@ -132,8 +132,8 @@ INLINE_VAR const strong_ordering strong_ordering::equal = strong_ordering(strong
132132
// a single operation, determine whether the left operand is less-than, greater-than,
133133
// or equal-to the right-hand operand.
134134
struct compare_three_way {
135-
BSONCXX_PUSH_WARNINGS();
136-
BSONCXX_DISABLE_WARNING(GNU("-Wfloat-equal"));
135+
BSONCXX_PRIVATE_WARNINGS_PUSH();
136+
BSONCXX_PRIVATE_WARNINGS_DISABLE(GNU("-Wfloat-equal"));
137137
template <
138138
typename L,
139139
typename R,
@@ -142,7 +142,7 @@ struct compare_three_way {
142142
constexpr static strong_ordering impl(L const& l, R const& r, rank<1>) {
143143
return (l < r) ? strong_ordering::less : (l == r ? strong_ordering::equal : strong_ordering::greater);
144144
}
145-
BSONCXX_POP_WARNINGS();
145+
BSONCXX_PRIVATE_WARNINGS_POP();
146146

147147
template <
148148
typename L,
@@ -153,25 +153,26 @@ struct compare_three_way {
153153
}
154154

155155
template <typename L, typename R>
156-
constexpr auto operator()(L const& l, R const& r) const BSONCXX_RETURNS((impl)(l, r, rank<2>{}));
156+
constexpr auto operator()(L const& l, R const& r) const BSONCXX_PRIVATE_RETURNS((impl)(l, r, rank<2>{}));
157157
};
158158

159159
// Inherit to define ADL-visible ordering operators based on an ADL-visible
160160
// implementation of tag_invoke(compare_three_way, l, r).
161161
struct ordering_operators {
162162
template <typename L, typename R>
163-
constexpr static auto impl(L const& l, R const& r, rank<1>) BSONCXX_RETURNS(tag_invoke(compare_three_way{}, l, r));
163+
constexpr static auto impl(L const& l, R const& r, rank<1>)
164+
BSONCXX_PRIVATE_RETURNS(tag_invoke(compare_three_way{}, l, r));
164165

165166
template <typename L, typename R>
166167
constexpr static auto impl(L const& l, R const& r, rank<0>)
167-
BSONCXX_RETURNS(tag_invoke(compare_three_way{}, r, l).inverted());
168+
BSONCXX_PRIVATE_RETURNS(tag_invoke(compare_three_way{}, r, l).inverted());
168169

169170
#pragma push_macro("DEFOP")
170171
#undef DEFOP
171172
#define DEFOP(Oper) \
172173
template <typename L, typename R> \
173174
constexpr friend auto operator Oper(L const& l, R const& r) \
174-
BSONCXX_RETURNS(ordering_operators::impl(l, r, rank<1>{}) Oper nullptr)
175+
BSONCXX_PRIVATE_RETURNS(ordering_operators::impl(l, r, rank<1>{}) Oper nullptr)
175176
DEFOP(<);
176177
DEFOP(>);
177178
DEFOP(<=);

‎src/bsoncxx/include/bsoncxx/v1/detail/macros.hpp

Lines changed: 52 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
#define BSONCXX_V1_DETAIL_MACROS_HPP
1818

1919
// Convert the given macro argument to a string literal, after macro expansion.
20-
#define BSONCXX_STRINGIFY(...) BSONCXX_STRINGIFY_IMPL(__VA_ARGS__)
21-
#define BSONCXX_STRINGIFY_IMPL(...) #__VA_ARGS__
20+
#define BSONCXX_PRIVATE_STRINGIFY(...) BSONCXX_PRIVATE_STRINGIFY_IMPL(__VA_ARGS__)
21+
#define BSONCXX_PRIVATE_STRINGIFY_IMPL(...) #__VA_ARGS__
2222

2323
// Token-paste two macro arguments, after macro expansion
24-
#define BSONCXX_CONCAT(A, ...) BSONCXX_CONCAT_IMPL(A, __VA_ARGS__)
25-
#define BSONCXX_CONCAT_IMPL(A, ...) A##__VA_ARGS__
24+
#define BSONCXX_PRIVATE_CONCAT(A, ...) BSONCXX_PRIVATE_CONCAT_IMPL(A, __VA_ARGS__)
25+
#define BSONCXX_PRIVATE_CONCAT_IMPL(A, ...) A##__VA_ARGS__
2626

2727
// Expands to a _Pragma() preprocessor directive, after macro expansion
2828
//
@@ -31,32 +31,32 @@
3131
//
3232
// Example:
3333
//
34-
// BSONCXX_PRAGMA(GCC diagnostic ignore "-Wconversion")
34+
// BSONCXX_PRIVATE_PRAGMA(GCC diagnostic ignore "-Wconversion")
3535
//
3636
// will become:
3737
//
3838
// _Pragma("GCC diagnostic ignore \"-Wconversion\"")
3939
//
40-
#define BSONCXX_PRAGMA(...) _bsoncxxPragma(__VA_ARGS__)
40+
#define BSONCXX_PRIVATE_PRAGMA(...) BSONCXX_PRIVATE_PRAGMA_IMPL(__VA_ARGS__)
4141
#ifdef _MSC_VER
4242
// Old MSVC doesn't recognize C++11 _Pragma(), but it always recognized __pragma
43-
#define _bsoncxxPragma(...) __pragma(__VA_ARGS__)
43+
#define BSONCXX_PRIVATE_PRAGMA_IMPL(...) __pragma(__VA_ARGS__)
4444
#else
45-
#define _bsoncxxPragma(...) _Pragma(BSONCXX_STRINGIFY(__VA_ARGS__))
45+
#define BSONCXX_PRIVATE_PRAGMA_IMPL(...) _Pragma(BSONCXX_PRIVATE_STRINGIFY(__VA_ARGS__))
4646
#endif
4747

4848
// Use in a declaration position to force the appearence of a semicolon
4949
// as the next token. Use this for statement-like or declaration-like macros to
5050
// enforce that their call sites are followed by a semicolon
51-
#define BSONCXX_FORCE_SEMICOLON static_assert(true, "")
51+
#define BSONCXX_PRIVATE_FORCE_SEMICOLON static_assert(true, "")
5252

5353
// Add a trailing noexcept, decltype-return, and return-body to a
5454
// function definition. (Not compatible with lambda expressions.)
5555
//
5656
// Example:
5757
//
5858
// template <typename T>
59-
// auto foo(T x, T y) BSONCXX_RETURNS(x + y);
59+
// auto foo(T x, T y) BSONCXX_PRIVATE_RETURNS(x + y);
6060
//
6161
// Becomes:
6262
//
@@ -65,11 +65,11 @@
6565
// -> decltype(x + y)
6666
// { return x + y };
6767
//
68-
#define BSONCXX_RETURNS(...) \
68+
#define BSONCXX_PRIVATE_RETURNS(...) \
6969
noexcept(noexcept(__VA_ARGS__))->decltype(__VA_ARGS__) { \
7070
return __VA_ARGS__; \
7171
} \
72-
BSONCXX_FORCE_SEMICOLON
72+
BSONCXX_PRIVATE_FORCE_SEMICOLON
7373

7474
// @macro mongocxx_cxx14_constexpr
7575
// Expands to `constexpr` if compiling as c++14 or greater, otherwise
@@ -78,30 +78,30 @@
7878
// Use this on functions that can only be constexpr in C++14 or newer, including
7979
// non-const member functions.
8080
#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L && _MSC_VER > 1910)
81-
#define bsoncxx_cxx14_constexpr constexpr
81+
#define BSONCXX_PRIVATE_CONSTEXPR_CXX14 constexpr
8282
#else
83-
#define bsoncxx_cxx14_constexpr inline
83+
#define BSONCXX_PRIVATE_CONSTEXPR_CXX14 inline
8484
#endif
8585

86-
#define BSONCXX_IF_MSVC(...)
87-
#define BSONCXX_IF_GCC(...)
88-
#define BSONCXX_IF_CLANG(...)
89-
#define BSONCXX_IF_GNU_LIKE(...) \
90-
BSONCXX_IF_GCC(__VA_ARGS__) \
91-
BSONCXX_IF_CLANG(__VA_ARGS__)
86+
#define BSONCXX_PRIVATE_IF_MSVC(...)
87+
#define BSONCXX_PRIVATE_IF_GCC(...)
88+
#define BSONCXX_PRIVATE_IF_CLANG(...)
89+
#define BSONCXX_PRIVATE_IF_GNU_LIKE(...) \
90+
BSONCXX_PRIVATE_IF_GCC(__VA_ARGS__) \
91+
BSONCXX_PRIVATE_IF_CLANG(__VA_ARGS__)
9292

9393
// clang-format off
9494
#ifdef __GNUC__
9595
#ifdef __clang__
96-
#undef BSONCXX_IF_CLANG
97-
#define BSONCXX_IF_CLANG(...) __VA_ARGS__
96+
#undef BSONCXX_PRIVATE_IF_CLANG
97+
#define BSONCXX_PRIVATE_IF_CLANG(...) __VA_ARGS__
9898
#else
99-
#undef BSONCXX_IF_GCC
100-
#define BSONCXX_IF_GCC(...) __VA_ARGS__
99+
#undef BSONCXX_PRIVATE_IF_GCC
100+
#define BSONCXX_PRIVATE_IF_GCC(...) __VA_ARGS__
101101
#endif
102102
#elif defined(_MSC_VER)
103-
#undef BSONCXX_IF_MSVC
104-
#define BSONCXX_IF_MSVC(...) __VA_ARGS__
103+
#undef BSONCXX_PRIVATE_IF_MSVC
104+
#define BSONCXX_PRIVATE_IF_MSVC(...) __VA_ARGS__
105105
#endif
106106
// clang-format on
107107

@@ -115,38 +115,42 @@
115115
// - MSVC(<id-integer-literal>)
116116
//
117117
// The "GNU" form applies to both GCC and Clang
118-
#define BSONCXX_DISABLE_WARNING(Spec) \
119-
BSONCXX_CONCAT(_bsoncxxDisableWarningImpl_for_, Spec) \
120-
BSONCXX_FORCE_SEMICOLON
118+
#define BSONCXX_PRIVATE_WARNINGS_DISABLE(Spec) \
119+
BSONCXX_PRIVATE_CONCAT(BSONCXX_PRIVATE_WARNINGS_DISABLE_IMPL_FOR_, Spec) \
120+
BSONCXX_PRIVATE_FORCE_SEMICOLON
121121

122122
// Push the current compiler diagnostics settings state
123-
#define BSONCXX_PUSH_WARNINGS() \
124-
BSONCXX_IF_GNU_LIKE(BSONCXX_PRAGMA(GCC diagnostic push)) \
125-
BSONCXX_IF_MSVC(BSONCXX_PRAGMA(warning(push))) \
126-
BSONCXX_FORCE_SEMICOLON
123+
#define BSONCXX_PRIVATE_WARNINGS_PUSH() \
124+
BSONCXX_PRIVATE_IF_GNU_LIKE(BSONCXX_PRIVATE_PRAGMA(GCC diagnostic push)) \
125+
BSONCXX_PRIVATE_IF_MSVC(BSONCXX_PRIVATE_PRAGMA(warning(push))) \
126+
BSONCXX_PRIVATE_FORCE_SEMICOLON
127127

128128
// Restore prior compiler diagnostics settings from before the most
129-
// recent BSONCXX_PUSH_WARNINGS()
130-
#define BSONCXX_POP_WARNINGS() \
131-
BSONCXX_IF_GNU_LIKE(BSONCXX_PRAGMA(GCC diagnostic pop)) \
132-
BSONCXX_IF_MSVC(BSONCXX_PRAGMA(warning(pop))) \
133-
BSONCXX_FORCE_SEMICOLON
129+
// recent BSONCXX_PRIVATE_WARNINGS_PUSH()
130+
#define BSONCXX_PRIVATE_WARNINGS_POP() \
131+
BSONCXX_PRIVATE_IF_GNU_LIKE(BSONCXX_PRIVATE_PRAGMA(GCC diagnostic pop)) \
132+
BSONCXX_PRIVATE_IF_MSVC(BSONCXX_PRIVATE_PRAGMA(warning(pop))) \
133+
BSONCXX_PRIVATE_FORCE_SEMICOLON
134134

135-
#define _bsoncxxDisableWarningImpl_for_GCC(...) BSONCXX_IF_GCC(BSONCXX_PRAGMA(GCC diagnostic ignored __VA_ARGS__))
135+
#define BSONCXX_PRIVATE_WARNINGS_DISABLE_IMPL_FOR_GCC(...) \
136+
BSONCXX_PRIVATE_IF_GCC(BSONCXX_PRIVATE_PRAGMA(GCC diagnostic ignored __VA_ARGS__))
136137

137-
#define _bsoncxxDisableWarningImpl_for_Clang(...) BSONCXX_IF_CLANG(BSONCXX_PRAGMA(GCC diagnostic ignored __VA_ARGS__))
138+
#define BSONCXX_PRIVATE_WARNINGS_DISABLE_IMPL_FOR_Clang(...) \
139+
BSONCXX_PRIVATE_IF_CLANG(BSONCXX_PRIVATE_PRAGMA(GCC diagnostic ignored __VA_ARGS__))
138140

139-
#define _bsoncxxDisableWarningImpl_for_GNU(...) \
140-
_bsoncxxDisableWarningImpl_for_GCC(__VA_ARGS__) _bsoncxxDisableWarningImpl_for_Clang(__VA_ARGS__)
141+
#define BSONCXX_PRIVATE_WARNINGS_DISABLE_IMPL_FOR_GNU(...) \
142+
BSONCXX_PRIVATE_WARNINGS_DISABLE_IMPL_FOR_GCC(__VA_ARGS__) \
143+
BSONCXX_PRIVATE_WARNINGS_DISABLE_IMPL_FOR_Clang(__VA_ARGS__)
141144

142-
#define _bsoncxxDisableWarningImpl_for_MSVC(...) BSONCXX_IF_MSVC(BSONCXX_PRAGMA(warning(disable : __VA_ARGS__)))
145+
#define BSONCXX_PRIVATE_WARNINGS_DISABLE_IMPL_FOR_MSVC(...) \
146+
BSONCXX_PRIVATE_IF_MSVC(BSONCXX_PRIVATE_PRAGMA(warning(disable : __VA_ARGS__)))
143147

144-
#define BSONCXX_FWD(...) static_cast<decltype(__VA_ARGS__)&&>(__VA_ARGS__)
148+
#define BSONCXX_PRIVATE_FWD(...) static_cast<decltype(__VA_ARGS__)&&>(__VA_ARGS__)
145149

146-
#define BSONCXX_UNREACHABLE \
147-
if (1) { \
148-
std::abort(); \
149-
} else \
150+
#define BSONCXX_PRIVATE_UNREACHABLE \
151+
if (1) { \
152+
std::abort(); \
153+
} else \
150154
((void)0)
151155

152156
#endif // BSONCXX_V1_DETAIL_MACROS_HPP

‎src/bsoncxx/include/bsoncxx/v1/detail/postlude.hpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,28 +42,28 @@
4242
// bsoncxx/v1/detail/macros.hpp
4343
#pragma pop_macro("BSONCXX_V1_DETAIL_MACROS_HPP")
4444
#if !defined(BSONCXX_V1_DETAIL_MACROS_HPP)
45-
#pragma pop_macro("BSONCXX_CONCAT")
46-
#pragma pop_macro("BSONCXX_CONCAT_IMPL")
47-
#pragma pop_macro("BSONCXX_DISABLE_WARNING")
48-
#pragma pop_macro("BSONCXX_FORCE_SEMICOLON")
49-
#pragma pop_macro("BSONCXX_FWD")
50-
#pragma pop_macro("BSONCXX_IF_CLANG")
51-
#pragma pop_macro("BSONCXX_IF_GCC")
52-
#pragma pop_macro("BSONCXX_IF_GNU_LIKE")
53-
#pragma pop_macro("BSONCXX_IF_MSVC")
54-
#pragma pop_macro("BSONCXX_POP_WARNINGS")
55-
#pragma pop_macro("BSONCXX_PRAGMA")
56-
#pragma pop_macro("BSONCXX_PUSH_WARNINGS")
57-
#pragma pop_macro("BSONCXX_RETURNS")
58-
#pragma pop_macro("BSONCXX_STRINGIFY")
59-
#pragma pop_macro("BSONCXX_STRINGIFY_IMPL")
60-
#pragma pop_macro("BSONCXX_UNREACHABLE")
61-
#pragma pop_macro("_bsoncxxDisableWarningImpl_for_Clang")
62-
#pragma pop_macro("_bsoncxxDisableWarningImpl_for_GCC")
63-
#pragma pop_macro("_bsoncxxDisableWarningImpl_for_GNU")
64-
#pragma pop_macro("_bsoncxxDisableWarningImpl_for_MSVC")
65-
#pragma pop_macro("_bsoncxxPragma")
66-
#pragma pop_macro("bsoncxx_cxx14_constexpr")
45+
#pragma pop_macro("BSONCXX_PRIVATE_CONCAT_IMPL")
46+
#pragma pop_macro("BSONCXX_PRIVATE_CONCAT")
47+
#pragma pop_macro("BSONCXX_PRIVATE_CONSTEXPR_CXX14")
48+
#pragma pop_macro("BSONCXX_PRIVATE_FORCE_SEMICOLON")
49+
#pragma pop_macro("BSONCXX_PRIVATE_FWD")
50+
#pragma pop_macro("BSONCXX_PRIVATE_IF_CLANG")
51+
#pragma pop_macro("BSONCXX_PRIVATE_IF_GCC")
52+
#pragma pop_macro("BSONCXX_PRIVATE_IF_GNU_LIKE")
53+
#pragma pop_macro("BSONCXX_PRIVATE_IF_MSVC")
54+
#pragma pop_macro("BSONCXX_PRIVATE_PRAGMA_IMPL")
55+
#pragma pop_macro("BSONCXX_PRIVATE_PRAGMA")
56+
#pragma pop_macro("BSONCXX_PRIVATE_RETURNS")
57+
#pragma pop_macro("BSONCXX_PRIVATE_STRINGIFY_IMPL")
58+
#pragma pop_macro("BSONCXX_PRIVATE_STRINGIFY")
59+
#pragma pop_macro("BSONCXX_PRIVATE_UNREACHABLE")
60+
#pragma pop_macro("BSONCXX_PRIVATE_WARNINGS_DISABLE_IMPL_FOR_Clang")
61+
#pragma pop_macro("BSONCXX_PRIVATE_WARNINGS_DISABLE_IMPL_FOR_GCC")
62+
#pragma pop_macro("BSONCXX_PRIVATE_WARNINGS_DISABLE_IMPL_FOR_GNU")
63+
#pragma pop_macro("BSONCXX_PRIVATE_WARNINGS_DISABLE_IMPL_FOR_MSVC")
64+
#pragma pop_macro("BSONCXX_PRIVATE_WARNINGS_DISABLE")
65+
#pragma pop_macro("BSONCXX_PRIVATE_WARNINGS_POP")
66+
#pragma pop_macro("BSONCXX_PRIVATE_WARNINGS_PUSH")
6767
#endif
6868

6969
#if !defined(BSONCXX_PRIVATE_V1_INSIDE_MACRO_GUARD_SCOPE)

0 commit comments

Comments
 (0)