Skip to content

CXX-3152 Remove obsolete inline namespace macros #1253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 4, 2024
Merged

CXX-3152 Remove obsolete inline namespace macros #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
130e609
CXX-3152 Remove obsolete inline namespace macros
eramongodb Nov 1, 2024
27aa804
Add changelog entry
eramongodb Nov 1, 2024
2ff0d3c
Merge remote-tracking branch 'upstream/master' into cxx-3152
eramongodb Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu
- Redeclarations of `bsoncxx::stdx` interfaces in the `mongocxx::stdx` namespace.
- Use `bsoncxx::stdx::optional<T>` instead of `mongocxx::stdx::optional<T>`.
- Use `bsoncxx::stdx::string_view` instead of `mongocxx::stdx::string_view`.
- Inline namespace macros for bsoncxx and mongocxx namespace: `*_INLINE_NAMESPACE_*`.
- The `<bsoncxx/util/functor.hpp>` header.

## 3.11.0
Expand Down
4 changes: 0 additions & 4 deletions src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
#pragma pop_macro("BSONCXX_CALL")

// config.hpp (generated by CMake)
#undef BSONCXX_INLINE_NAMESPACE_BEGIN
#pragma pop_macro("BSONCXX_INLINE_NAMESPACE_BEGIN")
#undef BSONCXX_INLINE_NAMESPACE_END
#pragma pop_macro("BSONCXX_INLINE_NAMESPACE_END")
#undef BSONCXX_POLY_USE_MNMLSTC
#pragma pop_macro("BSONCXX_POLY_USE_MNMLSTC")
#undef BSONCXX_POLY_USE_SYSTEM_MNMLSTC
Expand Down
4 changes: 0 additions & 4 deletions src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@
#undef BSONCXX_IF_GNU_LIKE

// config.hpp (generated by CMake)
#pragma push_macro("BSONCXX_INLINE_NAMESPACE_BEGIN")
#undef BSONCXX_INLINE_NAMESPACE_BEGIN
#pragma push_macro("BSONCXX_INLINE_NAMESPACE_END")
#undef BSONCXX_INLINE_NAMESPACE_END
#pragma push_macro("BSONCXX_POLY_USE_MNMLSTC")
#undef BSONCXX_POLY_USE_MNMLSTC
#pragma push_macro("BSONCXX_POLY_USE_SYSTEM_MNMLSTC")
Expand Down
18 changes: 0 additions & 18 deletions src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/fwd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,24 +157,6 @@
///
#define BSONCXX_POLY_USE_STD

///
/// @ingroup bsoncxx-v_noabi-bsoncxx-config-config-hpp
/// For internal use only!
///
/// @deprecated To be removed in an upcoming major release.
/// <!-- Explicitly documented due to long-standing availability. -->
///
#define BSONCXX_INLINE_NAMESPACE_BEGIN

///
/// @ingroup bsoncxx-v_noabi-bsoncxx-config-config-hpp
/// For internal use only!
///
/// @deprecated To be removed in an upcoming major release.
/// <!-- Explicitly documented due to long-standing availability. -->
///
#define BSONCXX_INLINE_NAMESPACE_END

///
/// @} <!-- bsoncxx/v_noabi/bsoncxx/config/config.hpp -->
///
Expand Down
3 changes: 0 additions & 3 deletions src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/config.hpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,3 @@
#cmakedefine BSONCXX_POLY_USE_BOOST
#cmakedefine BSONCXX_POLY_USE_IMPLS
#cmakedefine BSONCXX_POLY_USE_STD

#define BSONCXX_INLINE_NAMESPACE_BEGIN inline namespace v_noabi {
#define BSONCXX_INLINE_NAMESPACE_END } // namespace v_noabi
2 changes: 0 additions & 2 deletions src/bsoncxx/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ if(ENABLE_MACRO_GUARD_TESTS)
BSONCXX_CALL

# config.hpp (generated by CMake)
BSONCXX_INLINE_NAMESPACE_BEGIN
BSONCXX_INLINE_NAMESPACE_END
BSONCXX_POLY_USE_MNMLSTC
BSONCXX_POLY_USE_SYSTEM_MNMLSTC
BSONCXX_POLY_USE_BOOST
Expand Down
6 changes: 0 additions & 6 deletions src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@
#undef MONGOCXX_CALL
#pragma pop_macro("MONGOCXX_CALL")

// config.hpp (generated by CMake)
#undef MONGOCXX_INLINE_NAMESPACE_BEGIN
#pragma pop_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN")
#undef MONGOCXX_INLINE_NAMESPACE_END
#pragma pop_macro("MONGOCXX_INLINE_NAMESPACE_END")

// version.hpp (generated by CMake)
#undef MONGOCXX_VERSION_STRING
#pragma pop_macro("MONGOCXX_VERSION_STRING")
Expand Down
6 changes: 0 additions & 6 deletions src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@
#pragma push_macro("MONGOCXX_CALL")
#undef MONGOCXX_CALL

// config.hpp (generated by CMake)
#pragma push_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN")
#undef MONGOCXX_INLINE_NAMESPACE_BEGIN
#pragma push_macro("MONGOCXX_INLINE_NAMESPACE_END")
#undef MONGOCXX_INLINE_NAMESPACE_END

// version.hpp (generated by CMake)
#pragma push_macro("MONGOCXX_VERSION_STRING")
#undef MONGOCXX_VERSION_STRING
Expand Down
18 changes: 0 additions & 18 deletions src/mongocxx/include/mongocxx/v_noabi/mongocxx/fwd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,24 +154,6 @@
/// @{
///

///
/// @ingroup mongocxx-v_noabi-mongocxx-config-config-hpp
/// For internal use only!
///
/// @deprecated To be removed in an upcoming major release.
/// <!-- Explicitly documented due to long-standing availability. -->
///
#define MONGOCXX_INLINE_NAMESPACE_BEGIN

///
/// @ingroup mongocxx-v_noabi-mongocxx-config-config-hpp
/// For internal use only!
///
/// @deprecated To be removed in an upcoming major release.
/// <!-- Explicitly documented due to long-standing availability. -->
///
#define MONGOCXX_INLINE_NAMESPACE_END

///
/// @} <!-- mongocxx/v_noabi/mongocxx/config/config.hpp -->
///
Expand Down
3 changes: 0 additions & 3 deletions src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/config.hpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,3 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#define MONGOCXX_INLINE_NAMESPACE_BEGIN inline namespace v_noabi {
#define MONGOCXX_INLINE_NAMESPACE_END } // namespace v_noabi
4 changes: 0 additions & 4 deletions src/mongocxx/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,6 @@ if(ENABLE_MACRO_GUARD_TESTS)
MONGOCXX_INLINE
MONGOCXX_CALL

# config.hpp (generated by CMake)
MONGOCXX_INLINE_NAMESPACE_BEGIN
MONGOCXX_INLINE_NAMESPACE_END

# version.hpp (generated by CMake)
MONGOCXX_VERSION_STRING
MONGOCXX_VERSION_EXTRA
Expand Down