Skip to content

Commit 34e42fd

Browse files
authored
CXX-3152 Remove obsolete inline namespace macros (#1253)
1 parent db54586 commit 34e42fd

File tree

11 files changed

+1
-68
lines changed

11 files changed

+1
-68
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu
1414
- Redeclarations of `bsoncxx::stdx` interfaces in the `mongocxx::stdx` namespace.
1515
- Use `bsoncxx::stdx::optional<T>` instead of `mongocxx::stdx::optional<T>`.
1616
- Use `bsoncxx::stdx::string_view` instead of `mongocxx::stdx::string_view`.
17+
- Inline namespace macros for bsoncxx and mongocxx namespace: `*_INLINE_NAMESPACE_*`.
1718
- The `<bsoncxx/util/functor.hpp>` header.
1819

1920
## 3.11.0

src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919
#pragma pop_macro("BSONCXX_CALL")
2020

2121
// config.hpp (generated by CMake)
22-
#undef BSONCXX_INLINE_NAMESPACE_BEGIN
23-
#pragma pop_macro("BSONCXX_INLINE_NAMESPACE_BEGIN")
24-
#undef BSONCXX_INLINE_NAMESPACE_END
25-
#pragma pop_macro("BSONCXX_INLINE_NAMESPACE_END")
2622
#undef BSONCXX_POLY_USE_MNMLSTC
2723
#pragma pop_macro("BSONCXX_POLY_USE_MNMLSTC")
2824
#undef BSONCXX_POLY_USE_SYSTEM_MNMLSTC

src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@
6363
#undef BSONCXX_IF_GNU_LIKE
6464

6565
// config.hpp (generated by CMake)
66-
#pragma push_macro("BSONCXX_INLINE_NAMESPACE_BEGIN")
67-
#undef BSONCXX_INLINE_NAMESPACE_BEGIN
68-
#pragma push_macro("BSONCXX_INLINE_NAMESPACE_END")
69-
#undef BSONCXX_INLINE_NAMESPACE_END
7066
#pragma push_macro("BSONCXX_POLY_USE_MNMLSTC")
7167
#undef BSONCXX_POLY_USE_MNMLSTC
7268
#pragma push_macro("BSONCXX_POLY_USE_SYSTEM_MNMLSTC")

src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/fwd.hpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -157,24 +157,6 @@
157157
///
158158
#define BSONCXX_POLY_USE_STD
159159

160-
///
161-
/// @ingroup bsoncxx-v_noabi-bsoncxx-config-config-hpp
162-
/// For internal use only!
163-
///
164-
/// @deprecated To be removed in an upcoming major release.
165-
/// <!-- Explicitly documented due to long-standing availability. -->
166-
///
167-
#define BSONCXX_INLINE_NAMESPACE_BEGIN
168-
169-
///
170-
/// @ingroup bsoncxx-v_noabi-bsoncxx-config-config-hpp
171-
/// For internal use only!
172-
///
173-
/// @deprecated To be removed in an upcoming major release.
174-
/// <!-- Explicitly documented due to long-standing availability. -->
175-
///
176-
#define BSONCXX_INLINE_NAMESPACE_END
177-
178160
///
179161
/// @} <!-- bsoncxx/v_noabi/bsoncxx/config/config.hpp -->
180162
///

src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/config.hpp.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,3 @@
1717
#cmakedefine BSONCXX_POLY_USE_BOOST
1818
#cmakedefine BSONCXX_POLY_USE_IMPLS
1919
#cmakedefine BSONCXX_POLY_USE_STD
20-
21-
#define BSONCXX_INLINE_NAMESPACE_BEGIN inline namespace v_noabi {
22-
#define BSONCXX_INLINE_NAMESPACE_END } // namespace v_noabi

src/bsoncxx/test/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ if(ENABLE_MACRO_GUARD_TESTS)
9090
BSONCXX_CALL
9191

9292
# config.hpp (generated by CMake)
93-
BSONCXX_INLINE_NAMESPACE_BEGIN
94-
BSONCXX_INLINE_NAMESPACE_END
9593
BSONCXX_POLY_USE_MNMLSTC
9694
BSONCXX_POLY_USE_SYSTEM_MNMLSTC
9795
BSONCXX_POLY_USE_BOOST

src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
#undef MONGOCXX_CALL
1919
#pragma pop_macro("MONGOCXX_CALL")
2020

21-
// config.hpp (generated by CMake)
22-
#undef MONGOCXX_INLINE_NAMESPACE_BEGIN
23-
#pragma pop_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN")
24-
#undef MONGOCXX_INLINE_NAMESPACE_END
25-
#pragma pop_macro("MONGOCXX_INLINE_NAMESPACE_END")
26-
2721
// version.hpp (generated by CMake)
2822
#undef MONGOCXX_VERSION_STRING
2923
#pragma pop_macro("MONGOCXX_VERSION_STRING")

src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
#pragma push_macro("MONGOCXX_CALL")
1919
#undef MONGOCXX_CALL
2020

21-
// config.hpp (generated by CMake)
22-
#pragma push_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN")
23-
#undef MONGOCXX_INLINE_NAMESPACE_BEGIN
24-
#pragma push_macro("MONGOCXX_INLINE_NAMESPACE_END")
25-
#undef MONGOCXX_INLINE_NAMESPACE_END
26-
2721
// version.hpp (generated by CMake)
2822
#pragma push_macro("MONGOCXX_VERSION_STRING")
2923
#undef MONGOCXX_VERSION_STRING

src/mongocxx/include/mongocxx/v_noabi/mongocxx/fwd.hpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -154,24 +154,6 @@
154154
/// @{
155155
///
156156

157-
///
158-
/// @ingroup mongocxx-v_noabi-mongocxx-config-config-hpp
159-
/// For internal use only!
160-
///
161-
/// @deprecated To be removed in an upcoming major release.
162-
/// <!-- Explicitly documented due to long-standing availability. -->
163-
///
164-
#define MONGOCXX_INLINE_NAMESPACE_BEGIN
165-
166-
///
167-
/// @ingroup mongocxx-v_noabi-mongocxx-config-config-hpp
168-
/// For internal use only!
169-
///
170-
/// @deprecated To be removed in an upcoming major release.
171-
/// <!-- Explicitly documented due to long-standing availability. -->
172-
///
173-
#define MONGOCXX_INLINE_NAMESPACE_END
174-
175157
///
176158
/// @} <!-- mongocxx/v_noabi/mongocxx/config/config.hpp -->
177159
///

src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/config.hpp.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,3 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
15-
#define MONGOCXX_INLINE_NAMESPACE_BEGIN inline namespace v_noabi {
16-
#define MONGOCXX_INLINE_NAMESPACE_END } // namespace v_noabi

src/mongocxx/test/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,10 +297,6 @@ if(ENABLE_MACRO_GUARD_TESTS)
297297
MONGOCXX_INLINE
298298
MONGOCXX_CALL
299299

300-
# config.hpp (generated by CMake)
301-
MONGOCXX_INLINE_NAMESPACE_BEGIN
302-
MONGOCXX_INLINE_NAMESPACE_END
303-
304300
# version.hpp (generated by CMake)
305301
MONGOCXX_VERSION_STRING
306302
MONGOCXX_VERSION_EXTRA

0 commit comments

Comments
 (0)