diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e88f0e422f..ed235c7a11 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,9 +43,9 @@ General structure: - System Headers `` (alphabetical order) - Driver Headers `` (alphabetical order) - Open Namespace mongocxx - - `MONGOCXX_INLINE_NAMESPACE_BEGIN` + - `inline namespace v_noabi {` - Code - - `MONGOCXX_INLINE_NAMESPACE_END` + - `} // namespace v_noabi` - Close Namespace mongocxx - Header Postlude @@ -75,13 +75,13 @@ Example: #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { // Declarations // Inline Implementations -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/Doxyfile b/Doxyfile index cabd6552d7..23b7f490ee 100644 --- a/Doxyfile +++ b/Doxyfile @@ -854,7 +854,8 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = src \ +INPUT = src/bsoncxx/include \ + src/mongocxx/include \ etc/apidocmenu.md # This tag can be used to specify the character encoding of the source files @@ -899,10 +900,7 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = src/third_party \ - src/mongocxx/test_util \ - src/mongocxx/private \ - src/bsoncxx/stdx +EXCLUDE = # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded @@ -918,7 +916,7 @@ EXCLUDE_SYMLINKS = NO # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories for example use the pattern */test/* -EXCLUDE_PATTERNS = */private/* +EXCLUDE_PATTERNS = # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # (namespaces, classes, functions, etc.) that should be excluded from the @@ -929,7 +927,10 @@ EXCLUDE_PATTERNS = */private/* # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = bsoncxx::detail \ + bsoncxx::*::detail \ + mongocxx::detail \ + mongocxx::*::detail # The EXAMPLE_PATH tag can be used to specify one or more files or directories # that contain example code fragments that are included (see the \include @@ -2186,7 +2187,7 @@ SEARCH_INCLUDES = YES # preprocessor. # This tag requires that the tag SEARCH_INCLUDES is set to YES. -INCLUDE_PATH = +INCLUDE_PATH = src/bsoncxx/include/bsoncxx/v_noabi # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # patterns (like *.h and *.hpp) to filter out the header-files in the @@ -2204,12 +2205,14 @@ INCLUDE_FILE_PATTERNS = # recursively expanded use the := operator instead of the = operator. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. -PREDEFINED = BSONCXX_INLINE= \ - BSONCXX_API= \ +PREDEFINED = BSONCXX_API= \ BSONCXX_CALL= \ - MONGOCXX_INLINE= \ + BSONCXX_DEPRECATED \ + BSONCXX_INLINE= \ MONGOCXX_API= \ - MONGOCXX_CALL= + MONGOCXX_CALL= \ + MONGOCXX_DEPRECATED \ + MONGOCXX_INLINE= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this # tag can be used to specify a list of macro names that should be expanded. The diff --git a/docs/content/contributing/_index.md b/docs/content/contributing/_index.md index 8c75fe10c8..cc7b89b8a2 100644 --- a/docs/content/contributing/_index.md +++ b/docs/content/contributing/_index.md @@ -53,9 +53,9 @@ General structure: - System Headers `` (alphabetical order) - Driver Headers `` (alphabetical order) - Open Namespace mongocxx - - `MONGOCXX_INLINE_NAMESPACE_BEGIN` + - `inline namespace v_noabi {` - Code - - `MONGOCXX_INLINE_NAMESPACE_END` + - `} // namespace v_noabi` - Close Namespace mongocxx - Header Postlude @@ -85,13 +85,13 @@ Example: #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { // Declarations // Inline Implementations -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp index de7f92c108..dce4ca908e 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp @@ -22,8 +22,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace types { namespace bson_value { class view; @@ -123,7 +122,7 @@ BSONCXX_API bool BSONCXX_CALL operator!=(const types::bson_value::view& v, const } // namespace array -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/value.hpp index 35ecd46582..1ec9216435 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/value.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/value.hpp @@ -23,7 +23,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace array { /// @@ -114,7 +114,7 @@ BSONCXX_INLINE value::operator array::view() const noexcept { } } // namespace array -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp index 5dec9f55f1..8f49a1b6a1 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp @@ -24,8 +24,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace types { namespace bson_value { class view; @@ -194,7 +193,7 @@ class BSONCXX_API view::const_iterator { }; } // namespace array -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp index 29c61a3fa7..ec0e485eda 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp @@ -22,13 +22,13 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace array { using view_or_value = bsoncxx::view_or_value; } // namespace array -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp index 3d515cd327..c92b529638 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp @@ -24,7 +24,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace basic { @@ -113,7 +113,7 @@ bsoncxx::array::value BSONCXX_CALL make_array(Args&&... args) { } // namespace basic } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp index 122d482736..ac1430c7bc 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp @@ -24,7 +24,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace basic { @@ -116,7 +116,7 @@ bsoncxx::document::value BSONCXX_CALL make_document(Args&&... args) { } // namespace basic } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp index 58b06ba81b..541a1fceff 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp @@ -19,7 +19,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace basic { @@ -27,7 +27,7 @@ using bsoncxx::builder::concatenate; } // namespace basic } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp index ab97d81b3c..bde3a54803 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp @@ -21,7 +21,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace basic { namespace impl { @@ -63,7 +63,7 @@ BSONCXX_INLINE void value_append(core* core, T&& t) { } // namespace impl } // namespace basic } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp index 0d779aa535..412361b21c 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp @@ -19,7 +19,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace basic { @@ -34,7 +34,7 @@ BSONCXX_INLINE std::tuple kvp(T&& t, U&& u) { } // namespace basic } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp index ef8f3d0388..23c25d209e 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp @@ -21,7 +21,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace basic { @@ -80,7 +80,7 @@ class sub_array { } // namespace basic } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp index 7c345d3845..ee0e328db5 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp @@ -22,7 +22,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace basic { @@ -99,7 +99,7 @@ class sub_document { } // namespace basic } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp index 39a39430ca..f9d267244a 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp @@ -20,7 +20,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { /// @@ -116,7 +116,7 @@ BSONCXX_INLINE concatenate_array concatenate(array::view_or_value array) { } } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/core.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/core.hpp index b0ae7818b0..4b845e2a29 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/core.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/core.hpp @@ -28,7 +28,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { /// @@ -692,7 +692,7 @@ class BSONCXX_API core { }; } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp index 47636e8d53..d60b146756 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp @@ -24,7 +24,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { using namespace bsoncxx::types; @@ -184,5 +184,5 @@ class array : public list { array(initializer_list_t init) : list(init, false, true) {} }; } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp index 79fd1c56d7..78d00f7bcd 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp @@ -25,7 +25,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace stream { @@ -84,7 +84,7 @@ class array : public array_context<> { } // namespace stream } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp index 581a6b5013..70ec1b47d8 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp @@ -24,7 +24,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace stream { @@ -100,8 +100,7 @@ class array_context { /// This operation finishes all processing necessary to fully encode the /// bson bytes and returns an owning value. /// - /// @param _ - /// A finalize_type token + /// The argument must be a finalize_type token (it is otherwise ignored). /// /// @return A value type which holds the complete bson document. /// @@ -119,8 +118,7 @@ class array_context { /// /// << operator for opening a new subdocument in the core builder. /// - /// @param _ - /// An open_document_type token + /// The argument must be an open_document_type token (it is otherwise ignored). /// BSONCXX_INLINE key_context operator<<(const open_document_type) { _core->open_document(); @@ -144,8 +142,7 @@ class array_context { /// /// << operator for opening a new subarray in the core builder. /// - /// @param _ - /// An open_document_type token + /// The argument must be an open_document_type token (it is otherwise ignored). /// BSONCXX_INLINE array_context operator<<(const open_array_type) { _core->open_array(); @@ -155,8 +152,7 @@ class array_context { /// /// << operator for closing a subarray in the core builder. /// - /// @param _ - /// A close_array_type token + /// The argument must be a close_array_type token (it is otherwise ignored). /// BSONCXX_INLINE base operator<<(const close_array_type) { _core->close_array(); @@ -196,7 +192,7 @@ class array_context { } // namespace stream } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp index b0fe9cc80e..599b9a7e04 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp @@ -17,7 +17,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { class core; @@ -37,7 +37,7 @@ struct closed_context { } // namespace stream } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp index 22d00ab8b7..7cb4690b19 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp @@ -23,7 +23,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace stream { @@ -82,7 +82,7 @@ class document : public key_context<> { } // namespace stream } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp index 8e822d4cdb..27cdb5da35 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp @@ -20,7 +20,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace stream { @@ -92,7 +92,7 @@ constexpr finalize_type finalize; } // namespace stream } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp index a52e86f34d..115f7a388d 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp @@ -24,7 +24,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace stream { @@ -121,8 +121,7 @@ class key_context { /// This operation finishes all processing necessary to fully encode the /// bson bytes and returns an owning value. /// - /// @param _ - /// A finalize_type token + /// The argument must be a finalize_type token (it is otherwise ignored). /// /// @return A value type which holds the complete bson document. /// @@ -154,8 +153,7 @@ class key_context { /// /// << operator for closing a subdocument in the core builder. /// - /// @param _ - /// A close_document_type token + /// The argument must be a close_document_type token (it is otherwise ignored). /// BSONCXX_INLINE base operator<<(const close_document_type) { _core->close_document(); @@ -180,7 +178,7 @@ class key_context { } // namespace stream } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp index a831275d2c..09f496eeeb 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp @@ -22,7 +22,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace stream { @@ -46,8 +46,7 @@ class single_context { /// /// << operator for opening a new subdocument in the core builder. /// - /// @param _ - /// An open_document_type token + /// The argument must be an open_document_type token (it is otherwise ignored). /// BSONCXX_INLINE key_context<> operator<<(open_document_type) { _core->open_document(); @@ -58,8 +57,7 @@ class single_context { /// /// << operator for opening a new subarray in the core builder. /// - /// @param _ - /// An open_array_type token + /// The argument must be an open_array_type token (it is otherwise ignored). /// BSONCXX_INLINE array_context<> operator<<(open_array_type) { _core->open_array(); @@ -109,7 +107,7 @@ BSONCXX_INLINE value_context::operator single_context() { } // namespace stream } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp index 45a1077fc0..fb1d56d0c2 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp @@ -23,7 +23,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace stream { @@ -88,8 +88,7 @@ class value_context { /// /// << operator for opening a new subdocument in the core builder. /// - /// @param _ - /// An open_document_type token + /// The argument must be an open_document_type token (it is otherwise ignored). /// BSONCXX_INLINE key_context operator<<(const open_document_type) { _core->open_document(); @@ -99,8 +98,7 @@ class value_context { /// /// << operator for opening a new subarray in the core builder. /// - /// @param _ - /// An open_array_type token + /// The argument must be an open_array_type token (it is otherwise ignored). /// BSONCXX_INLINE array_context operator<<(const open_array_type) { _core->open_array(); @@ -139,7 +137,7 @@ class value_context { } // namespace stream } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp index 307a9a073d..29876aef97 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp @@ -72,3 +72,21 @@ #pragma push_macro("BSONCXX_UNREACHABLE") #undef BSONCXX_UNREACHABLE #define BSONCXX_UNREACHABLE std::abort() + +// Doxygen does not account for generated header files. +// Document globally applicable macros and namespaces here. + +/// +/// @namespace bsoncxx +/// The top-level namespace for bsoncxx library entities. +/// + +/// +/// @namespace bsoncxx::v_noabi +/// Entities declared in this namespace do not have a stable ABI. +/// + +/// +/// @namespace bsoncxx::v_noabi::stdx +/// Declares polyfills for C++17 forward compatibility. +/// diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp index 14dacdf4a7..e1d45b8280 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp @@ -22,8 +22,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Represents an IEEE 754-2008 BSON Decimal128 value in a platform-independent way. /// @@ -94,7 +93,7 @@ class BSONCXX_API decimal128 { uint64_t _low = 0; }; -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp index e7b1fef7d8..883141bda0 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp @@ -23,8 +23,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { enum class type : std::uint8_t; enum class binary_sub_type : std::uint8_t; @@ -450,7 +449,7 @@ BSONCXX_API bool BSONCXX_CALL operator!=(const types::bson_value::view& v, const } // namespace document -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp index ff16027a95..97e31c50ca 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp @@ -23,7 +23,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace document { /// @@ -267,7 +267,7 @@ BSONCXX_INLINE bool operator!=(const value& lhs, const value& rhs) { /// } // namespace document -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp index b05b425eb1..1f60bee32e 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp @@ -24,7 +24,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace document { /// @@ -188,7 +188,7 @@ class BSONCXX_API view::const_iterator { }; } // namespace document -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp index 5fb346643c..0cb16c9fe8 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp @@ -21,13 +21,13 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace document { using view_or_value = bsoncxx::view_or_value; } // namespace document -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp index 4988fa340b..be05dbf1f5 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp @@ -20,8 +20,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Enum representing the various error types that can occur while operating on BSON values. /// @@ -117,7 +116,7 @@ BSONCXX_INLINE std::error_code make_error_code(error_code error) { return {static_cast(error), error_category()}; } -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp index 949f76e7ce..5068295900 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp @@ -19,8 +19,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing any exceptions emitted from the bsoncxx library or /// its underlying implementation. @@ -29,7 +28,7 @@ class BSONCXX_API exception : public std::system_error { using std::system_error::system_error; }; -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/json.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/json.hpp index 97a602c05c..9e57179509 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/json.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/json.hpp @@ -23,12 +23,8 @@ #include -/// -/// Top level namespace for MongoDB C++ BSON functionality. -/// namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// An enumeration of the types of Extended JSON that the to_json function accepts enum class ExtendedJsonMode : std::uint8_t { @@ -83,7 +79,7 @@ BSONCXX_API document::value BSONCXX_CALL from_json(stdx::string_view json); /// BSONCXX_API document::value BSONCXX_CALL operator"" _bson(const char* json, size_t len); -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid.hpp index 488cd25cf7..ebdda60351 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid.hpp @@ -23,8 +23,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Represents a MongoDB ObjectId. As this BSON type is used within the MongoDB server /// as a primary key for each document, it is useful for representing a 'pointer' @@ -120,7 +119,7 @@ class BSONCXX_API oid { std::array _bytes; }; -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp index 5f07376cb1..51d23f4502 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp @@ -22,7 +22,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace stdx { namespace detail { @@ -131,7 +131,7 @@ std::unique_ptr make_unique_for_overwrite(Args&&... args) { } } // namespace stdx -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp index 17b6806b21..91d30ff474 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp @@ -21,7 +21,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace stdx { using ::core::make_optional; @@ -30,7 +30,7 @@ using ::core::nullopt_t; using ::core::optional; } // namespace stdx -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #elif defined(BSONCXX_POLY_USE_BOOST) @@ -40,7 +40,7 @@ BSONCXX_INLINE_NAMESPACE_END #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace stdx { using ::boost::optional; @@ -51,7 +51,7 @@ const nullopt_t nullopt{::boost::none}; using ::boost::make_optional; } // namespace stdx -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #elif defined(BSONCXX_POLY_USE_STD_EXPERIMENTAL) @@ -59,7 +59,7 @@ BSONCXX_INLINE_NAMESPACE_END #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace stdx { using ::std::experimental::make_optional; @@ -68,7 +68,7 @@ using ::std::experimental::nullopt_t; using ::std::experimental::optional; } // namespace stdx -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #elif defined(BSONCXX_POLY_USE_STD) @@ -76,7 +76,7 @@ BSONCXX_INLINE_NAMESPACE_END #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace stdx { using ::std::make_optional; @@ -85,7 +85,7 @@ using ::std::nullopt_t; using ::std::optional; } // namespace stdx -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #else diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp index 35a41177c4..d58b7d6c21 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp @@ -21,14 +21,14 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace stdx { using ::core::basic_string_view; using ::core::string_view; } // namespace stdx -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #elif defined(BSONCXX_POLY_USE_BOOST) @@ -40,14 +40,14 @@ BSONCXX_INLINE_NAMESPACE_END #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace stdx { using ::boost::basic_string_view; using ::boost::string_view; } // namespace stdx -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #else @@ -55,7 +55,7 @@ BSONCXX_INLINE_NAMESPACE_END #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace stdx { template > @@ -63,7 +63,7 @@ using basic_string_view = ::boost::basic_string_ref; using string_view = ::boost::string_ref; } // namespace stdx -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #endif @@ -73,14 +73,14 @@ BSONCXX_INLINE_NAMESPACE_END #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace stdx { using ::std::experimental::basic_string_view; using ::std::experimental::string_view; } // namespace stdx -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #elif defined(BSONCXX_POLY_USE_STD) @@ -88,14 +88,14 @@ BSONCXX_INLINE_NAMESPACE_END #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace stdx { using ::std::basic_string_view; using ::std::string_view; } // namespace stdx -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #else diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/string/to_string.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/string/to_string.hpp index 42546dca70..37402321c5 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/string/to_string.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/string/to_string.hpp @@ -22,7 +22,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace string { template to_string( } } // namespace string -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp index e5b5aa578e..670aac3419 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp @@ -22,7 +22,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace string { /// @@ -117,7 +117,7 @@ BSONCXX_INLINE bool operator!=(const char* lhs, const view_or_value& rhs) { /// } // namespace string -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types.hpp index 8c75114e4a..a97081e123 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types.hpp @@ -33,8 +33,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// An enumeration of each BSON type. /// These x-macros will expand to be of the form: @@ -681,7 +680,7 @@ BSONCXX_INLINE bool operator==(const b_maxkey&, const b_maxkey&) { #undef BSONCXX_ENUM } // namespace types -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp index 3cc78bc5f9..d8564c6be6 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp @@ -21,7 +21,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace types { namespace bson_value { @@ -37,7 +37,7 @@ BSONCXX_INLINE bson_value::value make_value(T&& t) { } // namespace bson_value } // namespace types -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp index 02a115ef06..7567a2950c 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp @@ -26,8 +26,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace types { namespace bson_value { @@ -321,7 +320,7 @@ BSONCXX_INLINE bool operator!=(const view& lhs, const value& rhs) { } // namespace bson_value } // namespace types -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp index 3d4074482a..e640cca6e5 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp @@ -23,8 +23,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace document { class element; } // namespace document @@ -339,7 +338,7 @@ BSONCXX_INLINE not_view operator!=(T&& lhs, const bson_value::view& rhs) { } // namespace bson_value } // namespace types -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp index 07b672bd7f..6bba6d5322 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp @@ -21,7 +21,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace types { namespace bson_value { @@ -29,7 +29,7 @@ using view_or_value = bsoncxx::view_or_value diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/value.hpp index e9a8852e85..7a170fcbd2 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/value.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/value.hpp @@ -19,8 +19,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace types { /// @@ -33,7 +32,7 @@ BSONCXX_DEPRECATED typedef types::bson_value::view value; } // namespace types -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/util/functor.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/util/functor.hpp index 624067f1b7..9daf64cb3c 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/util/functor.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/util/functor.hpp @@ -20,7 +20,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace util { // TODO(MSVC): VS2015U1 Completely falls apart trying to honor the @@ -108,7 +108,7 @@ struct is_functor : functor::is_functor_impl::value> {}; #endif } // namespace util -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/validate.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/validate.hpp index c39fa78911..cb88d33ebd 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/validate.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/validate.hpp @@ -23,8 +23,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class validator; /// @@ -156,7 +155,7 @@ class BSONCXX_API validator { std::unique_ptr _impl; }; -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/view_or_value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/view_or_value.hpp index 0de4e62925..f3431ea0e9 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/view_or_value.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/view_or_value.hpp @@ -21,8 +21,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing a view-or-value variant type. /// @@ -209,7 +208,7 @@ BSONCXX_INLINE bool operator!=(const Value& lhs, const view_or_value diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp index 63ffe8de52..58f3c07ef6 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp @@ -20,7 +20,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace array { element::element() : document::element() {} @@ -50,5 +50,5 @@ bool BSONCXX_CALL operator!=(const types::bson_value::view& v, const element& el } } // namespace array -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp index 559122f135..64f08726cf 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp @@ -19,7 +19,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace array { value::value(std::uint8_t* data, std::size_t length, deleter_type dtor) @@ -54,5 +54,5 @@ value::unique_ptr_type value::release() { } } // namespace array -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp index 50cd85e725..218886c374 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp @@ -24,7 +24,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace array { namespace { @@ -168,5 +168,5 @@ bool BSONCXX_CALL operator!=(view lhs, view rhs) { } } // namespace array -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp index 74c45468fb..c270b47f35 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp @@ -30,7 +30,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace builder { namespace { @@ -723,5 +723,5 @@ void core::clear() { } } // namespace builder -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/config.hpp.in b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/config.hpp.in index a4b8ef1b6b..e4a2a6704c 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/config.hpp.in +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/config.hpp.in @@ -19,5 +19,4 @@ #cmakedefine BSONCXX_POLY_USE_STD #define BSONCXX_INLINE_NAMESPACE_BEGIN inline namespace v_noabi { - #define BSONCXX_INLINE_NAMESPACE_END } // namespace v_noabi diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp index 41aa35144a..6f8bef5260 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp @@ -22,8 +22,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { decimal128::decimal128(stdx::string_view str) { bson_decimal128_t d128; if (!bson_decimal128_from_string(string::to_string(str).c_str(), &d128)) { @@ -50,5 +49,5 @@ bool BSONCXX_CALL operator!=(const decimal128& lhs, const decimal128& rhs) { return !(lhs == rhs); } -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp index 52eee8bfef..f22790e842 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp @@ -30,7 +30,7 @@ bson_iter_init_from_data_at_offset(&iter, _raw, _length, _offset, _keylen); namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace document { element::element() : element(nullptr, 0, 0, 0) {} @@ -164,5 +164,5 @@ bool BSONCXX_CALL operator!=(const types::bson_value::view& v, const element& el } } // namespace document -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp index c5c0fbb7f4..bb50542a6b 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp @@ -19,7 +19,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace document { value::value(std::uint8_t* data, std::size_t length, deleter_type dtor) @@ -97,5 +97,5 @@ void value::reset(document::view view) { } } // namespace document -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp index 6f71c602a1..bb503b0c51 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp @@ -22,7 +22,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace document { namespace { @@ -174,5 +174,5 @@ bool BSONCXX_CALL operator!=(view lhs, view rhs) { } } // namespace document -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp index bca8e792a5..2b6e63a184 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp @@ -19,8 +19,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace { class error_category_impl final : public std::error_category { @@ -92,5 +91,5 @@ const std::error_category& BSONCXX_CALL error_category() { return instance; } -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp index 833c1ea642..fd5df681d0 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp @@ -28,8 +28,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace { void bson_free_deleter(std::uint8_t* ptr) { @@ -103,5 +102,5 @@ document::value BSONCXX_CALL operator"" _bson(const char* str, size_t len) { return from_json(stdx::string_view{str, len}); } -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp index ed2ea91951..af046a5d7a 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp @@ -22,8 +22,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { oid::oid() { bson_oid_t oid; bson_oid_init(&oid, nullptr); @@ -102,5 +101,5 @@ bool BSONCXX_CALL operator!=(const oid& lhs, const oid& rhs) { return oid_compare(lhs, rhs) != 0; } -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/b64_ntop.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/b64_ntop.hh index 99ed1661a9..4f34b83bb0 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/b64_ntop.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/b64_ntop.hh @@ -48,7 +48,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace b64 { #define BSONCXX_B64_ASSERT(Cond) \ @@ -190,7 +190,7 @@ BSONCXX_INLINE int ntop(std::uint8_t const* src, } } // namespace b64 -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/helpers.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/helpers.hh index 70181c0b82..0f39a6f7b3 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/helpers.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/helpers.hh @@ -22,8 +22,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace helpers { inline document::view view_from_bson_t(const bson_t* bson) { @@ -48,7 +47,7 @@ inline bsoncxx::oid make_oid(const bson_oid_t* bson_oid) { } } // namespace helpers -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.cpp index 0620961506..1bf68560cf 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.cpp @@ -17,7 +17,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace { constexpr char kIndexTable[] = @@ -1060,5 +1060,5 @@ void itoa::_init() { } } -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.hh index abb48cdd1f..00e0049341 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.hh @@ -22,8 +22,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class BSONCXX_TEST_API itoa { public: explicit itoa(uint32_t i = 0); @@ -58,7 +57,7 @@ inline std::size_t itoa::length() const { return _len; } -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/stack.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/stack.hh index 6451ac6d94..f777ecffe9 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/stack.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/stack.hh @@ -21,8 +21,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { // Note: This stack is only intended for use with the 'frame' type in // builder core.cpp. template @@ -155,7 +154,7 @@ class stack { } }; -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp index 31a9de2494..678cb40fb8 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp @@ -18,7 +18,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace string { view_or_value view_or_value::terminated() const { @@ -37,5 +37,5 @@ const char* view_or_value::data() const { } } // namespace string -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp index 938a47f9cb..f1cbb244b5 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp @@ -17,8 +17,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { #define BSONCXX_ENUM(name, val) constexpr type types::b_##name::type_id; #include #undef BSONCXX_ENUM @@ -50,5 +49,5 @@ std::string BSONCXX_CALL to_string(binary_sub_type rhs) { } namespace types {} // namespace types -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh index bbf0a977c2..585b2c18e3 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh @@ -21,8 +21,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace types { namespace bson_value { @@ -63,7 +62,7 @@ BSONCXX_INLINE bson_value::value make_owning_bson(void* internal_value) { } // namespace bson_value } // namespace types -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp index f65303ac9f..ae6b28ed4c 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp @@ -22,7 +22,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace types { namespace bson_value { @@ -240,5 +240,5 @@ value::operator bson_value::view() const noexcept { } // namespace bson_value } // namespace types -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp index c9bde788e0..03248295e3 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp @@ -35,7 +35,7 @@ } while (0) namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace types { namespace bson_value { @@ -190,5 +190,5 @@ void view::destroy() noexcept { } // namespace bson_value } // namespace types -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh index f444e706af..208442a0a2 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh @@ -24,7 +24,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace types { BSONCXX_INLINE char* make_copy_for_libbson(stdx::string_view s, uint32_t* len_out = nullptr) { @@ -328,5 +328,5 @@ BSONCXX_INLINE void convert_from_libbson(bson_value_t* v, bsoncxx::types::b_arra } } // namespace types -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp index 3fbf3cbcbc..b6206dbd7e 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp @@ -19,8 +19,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { struct validator::impl { bool _check_utf8{false}; bool _check_utf8_allow_null{false}; @@ -105,5 +104,5 @@ stdx::optional BSONCXX_CALL validate(const std::uint8_t* data, return document::view{data, length}; } -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx diff --git a/src/bsoncxx/test/to_string.hh b/src/bsoncxx/test/to_string.hh index 53620a420a..6db748b87d 100644 --- a/src/bsoncxx/test/to_string.hh +++ b/src/bsoncxx/test/to_string.hh @@ -28,8 +28,7 @@ #include namespace bsoncxx { -BSONCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { inline std::string to_string(types::bson_value::view_or_value val) { switch (val.view().type()) { case bsoncxx::type::k_string: @@ -90,7 +89,7 @@ inline std::string to_string(types::bson_value::view_or_value val) { } } -BSONCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace bsoncxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/bulk_write.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/bulk_write.hpp index 3dfda1188d..0c9a5797b4 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/bulk_write.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/bulk_write.hpp @@ -22,8 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class collection; /// @@ -105,7 +104,7 @@ class MONGOCXX_API bulk_write { std::unique_ptr _impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/change_stream.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/change_stream.hpp index 1b27cb2d94..ca34b375cb 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/change_stream.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/change_stream.hpp @@ -22,8 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client; class collection; class database; @@ -214,7 +213,7 @@ class MONGOCXX_API change_stream::iterator { const change_stream* _change_stream; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client.hpp index d9338eff2a..41708deefa 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client.hpp @@ -29,12 +29,8 @@ #include -/// -/// Top level namespace for the MongoDB C++ driver. -/// namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client_session; /// @@ -447,7 +443,7 @@ MONGOCXX_INLINE database client::operator[](bsoncxx::string::view_or_value name) return database(name); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_encryption.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_encryption.hpp index 666b53310f..04fa9d0c78 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_encryption.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_encryption.hpp @@ -28,8 +28,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class database; class collection; @@ -275,7 +274,7 @@ class MONGOCXX_API client_encryption { std::unique_ptr _impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_session.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_session.hpp index 249c195ba2..fe1da1d542 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_session.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_session.hpp @@ -24,8 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client; /// @@ -206,7 +205,7 @@ class MONGOCXX_API client_session { std::unique_ptr _impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/collection.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/collection.hpp index ee568a1c53..c26fd3e10b 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/collection.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/collection.hpp @@ -62,11 +62,11 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { +class bulk_write; +class client_encryption; class client; class database; -class client_encryption; /// /// Class representing server side document groupings within a MongoDB database. @@ -692,6 +692,9 @@ class MONGOCXX_API collection { /// The write concern to use for this operation. Defaults to the collection wide write /// concern if none is provided. /// + /// @param collection_options (optional) + /// Collection options to use for this operation. + /// /// @exception /// mongocxx::operation_exception if the operation fails. /// @@ -712,6 +715,8 @@ class MONGOCXX_API collection { /// @param write_concern (optional) /// The write concern to use for this operation. Defaults to the collection wide write /// concern if none is provided. + /// @param collection_options (optional) + /// Collection options to use for this operation. /// /// @exception /// mongocxx::operation_exception if the operation fails. @@ -1854,9 +1859,9 @@ class MONGOCXX_API collection { search_index_view search_indexes(); private: - friend mongocxx::bulk_write; - friend mongocxx::database; - friend mongocxx::client_encryption; + friend class bulk_write; + friend class client_encryption; + friend class database; MONGOCXX_PRIVATE collection(const database& database, bsoncxx::string::view_or_value collection_name); @@ -2082,7 +2087,7 @@ MONGOCXX_INLINE stdx::optional collection::insert_many( return _insert_many(&session, begin, end, options); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp index 4fa8f55ced..674bf835b5 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp @@ -63,3 +63,16 @@ #pragma push_macro("MONGOCXX_UNREACHABLE") #undef MONGOCXX_UNREACHABLE #define MONGOCXX_UNREACHABLE std::abort() + +// Doxygen does not account for generated header files. +// Document globally applicable macros and namespaces here. + +/// +/// @namespace mongocxx +/// The top-level namespace for mongocxx library entities. +/// + +/// +/// @namespace mongocxx::v_noabi +/// Entities declared in this namespace do not have a stable ABI. +/// diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/cursor.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/cursor.hpp index 9e3aa0c0ba..633d4c9daf 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/cursor.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/cursor.hpp @@ -22,8 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class collection; class search_index_view; @@ -173,7 +172,7 @@ class MONGOCXX_API cursor::iterator { cursor* _cursor; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/database.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/database.hpp index ab2df5deb3..22f9ddcec6 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/database.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/database.hpp @@ -30,10 +30,10 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - -class client; +inline namespace v_noabi { class client_encryption; +class client; +class collection; /// /// Class representing a MongoDB database. @@ -624,9 +624,9 @@ class MONGOCXX_API database { /// private: - friend mongocxx::client; - friend mongocxx::collection; - friend mongocxx::client_encryption; + friend class client_encryption; + friend class client; + friend class collection; MONGOCXX_PRIVATE database(const class client& client, bsoncxx::string::view_or_value name); @@ -675,7 +675,7 @@ MONGOCXX_INLINE collection database::operator[](bsoncxx::string::view_or_value n return collection(name); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_failed_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_failed_event.hpp index 40b5d0d8a4..8d34a8ddec 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_failed_event.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_failed_event.hpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { /// @@ -103,7 +102,7 @@ class MONGOCXX_API command_failed_event { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_started_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_started_event.hpp index 73ccbf2331..2de3493cbe 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_started_event.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_started_event.hpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { /// @@ -103,7 +102,7 @@ class MONGOCXX_API command_started_event { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.hpp index 7812ded6db..d560f32283 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.hpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { /// @@ -103,7 +102,7 @@ class MONGOCXX_API command_succeeded_event { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.hpp index 2e5caa1301..9faa03d212 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.hpp @@ -21,8 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { /// @@ -81,7 +80,7 @@ class MONGOCXX_API heartbeat_failed_event { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.hpp index 4f1070b1be..09d2f77b75 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.hpp @@ -21,8 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { /// @@ -67,7 +66,7 @@ class MONGOCXX_API heartbeat_started_event { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.hpp index 72d1481055..306801e5f1 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.hpp @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { /// @@ -80,7 +79,7 @@ class MONGOCXX_API heartbeat_succeeded_event { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_changed_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_changed_event.hpp index 83ec88a022..cdaf6c65fd 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_changed_event.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_changed_event.hpp @@ -21,8 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { /// @@ -81,7 +80,7 @@ class MONGOCXX_API server_changed_event { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_closed_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_closed_event.hpp index 68260e994e..117b284976 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_closed_event.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_closed_event.hpp @@ -22,8 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { /// @@ -68,7 +67,7 @@ class MONGOCXX_API server_closed_event { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_description.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_description.hpp index 53d3a0effc..2d8465ca47 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_description.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_description.hpp @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { /// @@ -92,7 +91,7 @@ class MONGOCXX_API server_description { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_opening_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_opening_event.hpp index 5cbaeef5c6..1fde35a974 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_opening_event.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_opening_event.hpp @@ -21,8 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { /// @@ -67,7 +66,7 @@ class MONGOCXX_API server_opening_event { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_changed_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_changed_event.hpp index ce1a89cea0..31e4365730 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_changed_event.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_changed_event.hpp @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { /// @@ -66,7 +65,7 @@ class MONGOCXX_API topology_changed_event { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_closed_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_closed_event.hpp index c22b1868a4..bc00bfe421 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_closed_event.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_closed_event.hpp @@ -19,8 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { /// @@ -51,7 +50,7 @@ class MONGOCXX_API topology_closed_event { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_description.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_description.hpp index bbde379168..a8bfa14741 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_description.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_description.hpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { using mongocxx::read_preference; @@ -159,7 +158,7 @@ class MONGOCXX_API topology_description { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_opening_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_opening_event.hpp index ebc97c0093..a7bfb710c7 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_opening_event.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_opening_event.hpp @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace events { /// @@ -51,7 +50,7 @@ class MONGOCXX_API topology_opening_event { }; } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/authentication_exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/authentication_exception.hpp index fdc33fa190..567de77ebb 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/authentication_exception.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/authentication_exception.hpp @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing an exception during authentication. /// @@ -32,7 +31,7 @@ class MONGOCXX_API authentication_exception : public operation_exception { using operation_exception::operation_exception; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.hpp index ddd71af648..f73f1a0966 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.hpp @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing an exception during a bulk write operation. /// @@ -32,7 +31,7 @@ class MONGOCXX_API bulk_write_exception : public operation_exception { using operation_exception::operation_exception; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/error_code.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/error_code.hpp index d3c3cf71e7..3287ecf6c4 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/error_code.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/error_code.hpp @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Enum representing the various error types that can occur during driver usage. /// @@ -121,7 +120,7 @@ MONGOCXX_INLINE std::error_code make_error_code(error_code error) { return {static_cast(error), error_category()}; } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/exception.hpp index fbb30dade7..9d788e790e 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/exception.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/exception.hpp @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// A class to be used as the base class for all mongocxx exceptions. /// @@ -29,7 +28,7 @@ class MONGOCXX_API exception : public std::system_error { using system_error::system_error; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/gridfs_exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/gridfs_exception.hpp index 01eea3acfd..383440f99d 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/gridfs_exception.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/gridfs_exception.hpp @@ -19,8 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing an error encountered when attempting to perform the requested GridFS /// operation. @@ -32,7 +31,7 @@ class MONGOCXX_API gridfs_exception : public exception { using exception::exception; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/logic_error.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/logic_error.hpp index 7401041c2b..d19c712a98 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/logic_error.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/logic_error.hpp @@ -19,8 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing an exception caused by using the mongocxx API improperly. /// @@ -31,7 +30,7 @@ class MONGOCXX_API logic_error : public exception { using exception::exception; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp index ef83ee8244..2773fc3c92 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp @@ -22,8 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing an exception received from a MongoDB server. It includes the server-provided /// error code, if one was available. @@ -75,7 +74,7 @@ class MONGOCXX_API operation_exception : public exception { stdx::optional _raw_server_error; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/query_exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/query_exception.hpp index cababb837e..a8ef8d51a6 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/query_exception.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/query_exception.hpp @@ -19,8 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing an exception during a query operation. /// @@ -31,7 +30,7 @@ class MONGOCXX_API query_exception : public operation_exception { using operation_exception::operation_exception; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/server_error_code.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/server_error_code.hpp index cee7545674..9178776d75 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/server_error_code.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/server_error_code.hpp @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Enum representing the various errors types that can be returned from the server. As this list /// changes over time, this is just a placeholder for an Int32 error code value from the server. @@ -48,7 +47,7 @@ MONGOCXX_INLINE std::error_code make_error_code(server_error_code error) { return {static_cast(error), server_error_category()}; } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/write_exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/write_exception.hpp index cf900713db..00dd2a9905 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/write_exception.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/write_exception.hpp @@ -19,8 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing an exception during a write operation. /// @@ -31,7 +30,7 @@ class MONGOCXX_API write_exception : public operation_exception { using operation_exception::operation_exception; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/bucket.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/bucket.hpp index a80f59ef1f..e88853c41b 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/bucket.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/bucket.hpp @@ -34,8 +34,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class database; namespace gridfs { @@ -500,6 +499,13 @@ class MONGOCXX_API bucket { /// re-thrown. /// void download_to_stream(bsoncxx::types::bson_value::view id, std::ostream* destination); + + /// + /// @copydoc download_to_stream(bsoncxx::types::bson_value::view id, std::ostream* destination) + /// + /// @param start The byte offset to the beginning of content to download. + /// @param end The byte offset to the end of content to download. + /// void download_to_stream(bsoncxx::types::bson_value::view id, std::ostream* destination, std::size_t start, @@ -531,6 +537,15 @@ class MONGOCXX_API bucket { void download_to_stream(const client_session& session, bsoncxx::types::bson_value::view id, std::ostream* destination); + + // clang-format off + /// + /// @copydoc download_to_stream(const client_session& session, bsoncxx::types::bson_value::view id, std::ostream* destination) + /// + /// @param start The byte offset to the beginning of content to download. + /// @param end The byte offset to the end of content to download. + /// + // clang-format on void download_to_stream(const client_session& session, bsoncxx::types::bson_value::view id, std::ostream* destination, @@ -675,7 +690,7 @@ class MONGOCXX_API bucket { }; } // namespace gridfs -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/downloader.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/downloader.hpp index 1d496921c8..4f5fd01d6f 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/downloader.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/downloader.hpp @@ -28,9 +28,12 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace gridfs { +/// +/// Class used to specify the offset from which to start reading the chunks of the file. +/// struct chunks_and_bytes_offset { std::int32_t chunks_offset = 0; std::int32_t bytes_offset = 0; @@ -165,5 +168,5 @@ class MONGOCXX_API downloader { }; } // namespace gridfs -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/uploader.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/uploader.hpp index 1a1bce3975..fa7c53723b 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/uploader.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/uploader.hpp @@ -31,7 +31,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace gridfs { /// @@ -166,5 +166,5 @@ class MONGOCXX_API uploader { }; } // namespace gridfs -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/hint.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/hint.hpp index 81785e842b..55a6ab38ae 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/hint.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/hint.hpp @@ -24,8 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing a hint to be passed to a database operation. /// @@ -141,7 +140,7 @@ MONGOCXX_INLINE hint::operator bsoncxx::types::bson_value::view() const { return to_value(); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/index_model.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/index_model.hpp index 59ba37a3e9..74d2ae0b81 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/index_model.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/index_model.hpp @@ -21,8 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing an index on a MongoDB server. /// @@ -73,7 +72,7 @@ class MONGOCXX_API index_model { bsoncxx::document::value _options; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx -#include \ No newline at end of file +#include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/index_view.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/index_view.hpp index ae1ddfe796..f229de8d6d 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/index_view.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/index_view.hpp @@ -27,8 +27,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing a MongoDB index view. /// @@ -432,7 +431,7 @@ class MONGOCXX_API index_view { std::unique_ptr _impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/instance.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/instance.hpp index fc2d0120c8..e370111d4d 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/instance.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/instance.hpp @@ -19,8 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class logger; /// @@ -128,7 +127,7 @@ class MONGOCXX_API instance { std::unique_ptr _impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger.hpp index 22b8fa3a9b..073653b75e 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger.hpp @@ -22,8 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// The log level of a message passed to a mongocxx::logger. /// @@ -75,7 +74,7 @@ class MONGOCXX_API logger { logger(); }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/delete_many.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/delete_many.hpp index 26367a2fc8..c3bf37343b 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/delete_many.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/delete_many.hpp @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace model { /// @@ -100,7 +100,7 @@ class MONGOCXX_API delete_many { }; } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/delete_one.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/delete_one.hpp index 06a3887391..cd0db801da 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/delete_one.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/delete_one.hpp @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace model { /// @@ -97,7 +97,7 @@ class MONGOCXX_API delete_one { }; } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/insert_one.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/insert_one.hpp index 3fd4aa3155..26c62b3c02 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/insert_one.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/insert_one.hpp @@ -19,7 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace model { /// @@ -47,7 +47,7 @@ class MONGOCXX_API insert_one { }; } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/replace_one.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/replace_one.hpp index 76eb360cf9..d05a510d37 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/replace_one.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/replace_one.hpp @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace model { /// @@ -131,7 +131,7 @@ class MONGOCXX_API replace_one { }; } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/update_many.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/update_many.hpp index 8091105df5..97b77d9b82 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/update_many.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/update_many.hpp @@ -24,8 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace model { /// @@ -196,7 +195,7 @@ class MONGOCXX_API update_many { }; } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/update_one.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/update_one.hpp index b1cf6a4a94..a485f3a495 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/update_one.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/update_one.hpp @@ -24,8 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace model { /// @@ -197,7 +196,7 @@ class MONGOCXX_API update_one { }; } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/write.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/write.hpp index 7fc9c93e27..4d6602af0f 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/write.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/write.hpp @@ -28,7 +28,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace model { /// @@ -148,7 +148,7 @@ class MONGOCXX_API write { }; } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/aggregate.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/aggregate.hpp index 15e5039200..7ef3b7c0a4 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/aggregate.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/aggregate.hpp @@ -30,7 +30,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -322,7 +322,7 @@ class MONGOCXX_API aggregate { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/apm.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/apm.hpp index 116c0c37d4..1ea7148e2e 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/apm.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/apm.hpp @@ -32,7 +32,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -359,7 +359,7 @@ class MONGOCXX_API apm { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/auto_encryption.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/auto_encryption.hpp index e6496e4a0d..586e60e7ab 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/auto_encryption.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/auto_encryption.hpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client; class pool; @@ -131,6 +130,7 @@ class MONGOCXX_API auto_encryption { /// supported: "aws", "azure", "gcp", "kmip", and "local". The kmsProviders map values differ /// by provider: /// + /// @code{.unparsed} /// aws: { /// accessKeyId: String, /// secretAccessKey: String @@ -156,6 +156,7 @@ class MONGOCXX_API auto_encryption { /// local: { /// key: byte[96] // The master key used to encrypt/decrypt data keys. /// } + /// @endcode /// /// @param kms_providers /// A document containing the KMS providers. @@ -181,11 +182,13 @@ class MONGOCXX_API auto_encryption { /// Multiple KMS providers may be specified. Supported KMS providers are "aws", "azure", "gcp", /// and "kmip". The map value has the same form for all supported providers: /// + /// @code{.unparsed} /// : { /// tlsCaFile: Optional /// tlsCertificateKeyFile: Optional /// tlsCertificateKeyFilePassword: Optional /// } + /// @endcode /// /// @param tls_opts /// A document containing the TLS options. @@ -386,5 +389,5 @@ class MONGOCXX_API auto_encryption { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/bulk_write.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/bulk_write.hpp index 79e1eafb7e..c83766efaf 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/bulk_write.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/bulk_write.hpp @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -154,7 +154,7 @@ class MONGOCXX_API bulk_write { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/change_stream.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/change_stream.hpp index 778b75a283..be0a6c90da 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/change_stream.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/change_stream.hpp @@ -25,8 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client; class collection; class database; @@ -278,7 +277,7 @@ class MONGOCXX_API change_stream { bool _start_at_operation_time_set = false; }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client.hpp index 9ef61d06bb..a7a81a3bd1 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client.hpp @@ -25,7 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { // NOTE: client options interface still evolving @@ -146,7 +146,7 @@ class MONGOCXX_API client { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client_encryption.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client_encryption.hpp index e46f9f649b..0414f04f91 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client_encryption.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client_encryption.hpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client; class client_encryption; @@ -93,6 +92,7 @@ class MONGOCXX_API client_encryption { /// "aws", "azure", "gcp", "kmip", and "local". The kmsProviders map values differ /// by provider: /// + /// @code{.unparsed} /// aws: { /// accessKeyId: String, /// secretAccessKey: String @@ -118,6 +118,7 @@ class MONGOCXX_API client_encryption { /// local: { /// key: byte[96] // The master key used to encrypt/decrypt data keys. /// } + /// @endcode /// /// @param kms_providers /// A document containing the KMS providers. @@ -143,11 +144,13 @@ class MONGOCXX_API client_encryption { /// Multiple KMS providers may be specified. Supported KMS providers are "aws", "azure", "gcp", /// and "kmip". The map value has the same form for all supported providers: /// + /// @code{.unparsed} /// : { /// tlsCaFile: Optional /// tlsCertificateKeyFile: Optional /// tlsCertificateKeyFilePassword: Optional /// } + /// @endcode /// /// @param tls_opts /// A document containing the TLS options. @@ -179,7 +182,7 @@ class MONGOCXX_API client_encryption { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client_session.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client_session.hpp index 480f927c15..618360be44 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client_session.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client_session.hpp @@ -21,7 +21,9 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { +class client_session; + namespace options { /// @@ -97,7 +99,7 @@ class MONGOCXX_API client_session { private: // Allow the implementation of client_session to see these: - friend mongocxx::client_session; + friend class mongocxx::client_session; stdx::optional _causal_consistency; stdx::optional _enable_snapshot_reads; @@ -106,7 +108,7 @@ class MONGOCXX_API client_session { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/count.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/count.hpp index 99b7ce556f..0d466984b1 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/count.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/count.hpp @@ -27,8 +27,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace options { /// @@ -209,7 +208,7 @@ class MONGOCXX_API count { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/create_collection.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/create_collection.hpp index ebf1782486..3e999266c5 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/create_collection.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/create_collection.hpp @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -243,7 +243,7 @@ MONGOCXX_INLINE create_collection_deprecated::operator bsoncxx::document::value( } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/data_key.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/data_key.hpp index 2f1e5006b6..261f19b512 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/data_key.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/data_key.hpp @@ -24,8 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client_encryption; namespace options { @@ -164,5 +163,5 @@ class MONGOCXX_API data_key { } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/delete.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/delete.hpp index eb2f415a57..779a7c5720 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/delete.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/delete.hpp @@ -23,7 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -153,7 +153,7 @@ class MONGOCXX_API delete_options { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/distinct.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/distinct.hpp index d5c8452426..22120ed3c6 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/distinct.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/distinct.hpp @@ -26,7 +26,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -135,7 +135,7 @@ class MONGOCXX_API distinct { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/encrypt.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/encrypt.hpp index 5b9532e641..63ccadf2a1 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/encrypt.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/encrypt.hpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client_encryption; namespace options { @@ -230,7 +229,7 @@ class MONGOCXX_API encrypt { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/estimated_document_count.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/estimated_document_count.hpp index 201e15afcd..2516989e7d 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/estimated_document_count.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/estimated_document_count.hpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace options { /// @@ -108,7 +107,7 @@ class MONGOCXX_API estimated_document_count { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find.hpp index 317ccb52e6..60d419f3c3 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find.hpp @@ -28,7 +28,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -580,7 +580,7 @@ class MONGOCXX_API find { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp index 46ccca4128..5ca73b38ce 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp @@ -26,7 +26,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -229,7 +229,7 @@ class MONGOCXX_API find_one_and_delete { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.hpp index a01cbe5e45..8a521a4a8e 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.hpp @@ -28,7 +28,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -312,7 +312,7 @@ class MONGOCXX_API find_one_and_replace { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_update.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_update.hpp index 4212a3d441..a9544b3154 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_update.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_update.hpp @@ -29,7 +29,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -339,7 +339,7 @@ class MONGOCXX_API find_one_and_update { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp index 482097cbfe..3e571d9d8e 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -32,7 +32,7 @@ enum class return_document { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.hpp index 2e771c8af1..f719581cac 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.hpp @@ -25,7 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { namespace gridfs { @@ -154,7 +154,7 @@ class MONGOCXX_API bucket { } // namespace gridfs } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/gridfs/upload.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/gridfs/upload.hpp index 2f5e88e6f9..c9d9df4306 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/gridfs/upload.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/gridfs/upload.hpp @@ -21,7 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { namespace gridfs { @@ -79,7 +79,7 @@ class MONGOCXX_API upload { } // namespace gridfs } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/index.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/index.hpp index ed3e41a220..2a66d15140 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/index.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/index.hpp @@ -27,8 +27,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class collection; namespace options { @@ -502,7 +501,7 @@ class MONGOCXX_API index { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/index_view.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/index_view.hpp index fa35282fab..4d5df1195b 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/index_view.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/index_view.hpp @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -142,7 +142,7 @@ class MONGOCXX_API index_view { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/insert.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/insert.hpp index d83e6aadce..2577432712 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/insert.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/insert.hpp @@ -23,7 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -137,7 +137,7 @@ class MONGOCXX_API insert { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/pool.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/pool.hpp index 668985e596..42ca0df9e2 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/pool.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/pool.hpp @@ -19,7 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -49,7 +49,7 @@ class MONGOCXX_API pool { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/range.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/range.hpp index ebf7df3918..95d70d1cf1 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/range.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/range.hpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace options { /// @@ -80,5 +79,5 @@ class MONGOCXX_API range { } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/replace.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/replace.hpp index 2e79f3c60f..1e2949ab0c 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/replace.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/replace.hpp @@ -25,7 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -205,7 +205,7 @@ class MONGOCXX_API replace { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.hpp index a8d352650e..172a6bf8f8 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.hpp @@ -23,12 +23,14 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client_encryption; namespace options { +/// +/// Class representing options for a rewrap many datakey operation. +/// class MONGOCXX_API rewrap_many_datakey { public: /// @@ -103,7 +105,7 @@ class MONGOCXX_API rewrap_many_datakey { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/server_api.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/server_api.hpp index cf601d15fc..816d054506 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/server_api.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/server_api.hpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client; class pool; @@ -137,7 +136,7 @@ class MONGOCXX_API server_api { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/ssl.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/ssl.hpp index 2b7c1a5019..568b4ab885 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/ssl.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/ssl.hpp @@ -21,7 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -34,7 +34,7 @@ namespace options { MONGOCXX_DEPRECATED typedef tls ssl; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/tls.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/tls.hpp index 25eff083ee..3d4f64890e 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/tls.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/tls.hpp @@ -23,7 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -157,7 +157,7 @@ class MONGOCXX_API tls { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/transaction.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/transaction.hpp index 204235983f..defb0edc18 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/transaction.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/transaction.hpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client_session; class read_concern; class write_concern; @@ -157,7 +156,7 @@ class MONGOCXX_API transaction { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/update.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/update.hpp index 69f7549901..1b3837d908 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/update.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/update.hpp @@ -25,7 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { /// @@ -230,7 +230,7 @@ class MONGOCXX_API update { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/pipeline.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/pipeline.hpp index f1c833ac33..851a95d374 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/pipeline.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/pipeline.hpp @@ -26,8 +26,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client; class collection; class database; @@ -552,7 +551,7 @@ class MONGOCXX_API pipeline { std::unique_ptr _impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/pool.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/pool.hpp index afe04cc6f4..d0feb56ea1 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/pool.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/pool.hpp @@ -25,8 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client; /// @@ -118,7 +117,7 @@ class MONGOCXX_API pool { const std::unique_ptr _impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/read_concern.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/read_concern.hpp index a195224632..49559d3870 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/read_concern.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/read_concern.hpp @@ -25,13 +25,16 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client; class collection; class database; class uri; +namespace options { +class transaction; +} + /// /// A class to represent the read concern. Read concern can be set at the client, database, or /// collection level. The read concern can also be provided via connection string, and will be @@ -154,12 +157,12 @@ class MONGOCXX_API read_concern { bsoncxx::document::value to_document() const; private: - friend client; - friend collection; - friend database; - /// \relates mongocxx::options::transaction - friend mongocxx::options::transaction; - friend uri; + friend class client; + friend class collection; + friend class database; + friend class uri; + + friend class options::transaction; /// /// @{ @@ -181,7 +184,7 @@ class MONGOCXX_API read_concern { std::unique_ptr _impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/read_preference.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/read_preference.hpp index f2c0b720a7..86da758d96 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/read_preference.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/read_preference.hpp @@ -28,18 +28,21 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client; class collection; class database; -class uri; class search_index_view; +class uri; namespace events { class topology_description; } +namespace options { +class transaction; +} + /// /// Class representing a preference for how the driver routes read operations to members of a /// replica set or to a sharded cluster. @@ -181,7 +184,7 @@ class MONGOCXX_API read_preference { /// /// Sets or updates the tag set list for this read_preference. /// - /// @param tags + /// @param tag_set_list /// Document representing the tag set list. /// /// @see https://www.mongodb.com/docs/manual/core/read-preference-tags/ @@ -195,7 +198,7 @@ class MONGOCXX_API read_preference { /// /// Sets or updates the tag set list for this read_preference. /// - /// @param tags + /// @param tag_set_list /// Array of tag sets. /// /// @see https://www.mongodb.com/docs/manual/core/read-preference-tags/ @@ -282,15 +285,14 @@ class MONGOCXX_API read_preference { const stdx::optional hedge() const; private: - friend client; - friend collection; - friend database; - /// \relates mongocxx::options::transaction - friend mongocxx::options::transaction; - /// \relates mongocxx::events::topology_description - friend mongocxx::events::topology_description; - friend uri; - friend search_index_view; + friend class client; + friend class collection; + friend class database; + friend class search_index_view; + friend class uri; + + friend class events::topology_description; + friend class options::transaction; /// /// @{ @@ -314,7 +316,7 @@ class MONGOCXX_API read_preference { std::unique_ptr _impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp index 99c5dff091..622605ce44 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp @@ -25,7 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { /// @@ -93,7 +93,7 @@ class MONGOCXX_API bulk_write { }; } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/delete.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/delete.hpp index c7137b0711..158f66a412 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/delete.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/delete.hpp @@ -21,7 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { /// @@ -54,7 +54,7 @@ class MONGOCXX_API delete_result { }; } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/gridfs/upload.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/gridfs/upload.hpp index 3846199e9a..a89301ae24 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/gridfs/upload.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/gridfs/upload.hpp @@ -20,7 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { namespace gridfs { @@ -50,7 +50,7 @@ class MONGOCXX_API upload { } // namespace gridfs } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/insert_many.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/insert_many.hpp index 49898e8499..16fe6e1054 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/insert_many.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/insert_many.hpp @@ -24,8 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class collection; namespace result { @@ -89,7 +88,7 @@ class MONGOCXX_API insert_many { }; } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/insert_one.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/insert_one.hpp index f76b1136d4..d64369e366 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/insert_one.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/insert_one.hpp @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { /// Class representing the result of a MongoDB insert operation. @@ -59,7 +59,7 @@ class MONGOCXX_API insert_one { }; } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/replace_one.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/replace_one.hpp index fbb1f83773..3732ee8ba0 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/replace_one.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/replace_one.hpp @@ -24,7 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { /// Class representing the result of a MongoDB replace_one operation. @@ -69,7 +69,7 @@ class MONGOCXX_API replace_one { }; } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.hpp index c9279ddf79..07c4bc0ca1 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.hpp @@ -21,7 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { /// Class representing the result of a MongoDB rewrap_many_datakey operation. @@ -43,7 +43,7 @@ class MONGOCXX_API rewrap_many_datakey { }; } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/update.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/update.hpp index 85070f8977..e1d7f2d2fd 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/update.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/update.hpp @@ -24,7 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { /// Class representing the result of a MongoDB update operation. @@ -74,7 +74,7 @@ class MONGOCXX_API update { }; } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/search_index_model.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/search_index_model.hpp index e4a10c61ae..d5a9a190b6 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/search_index_model.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/search_index_model.hpp @@ -10,8 +10,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing a search index on a MongoDB server. /// @@ -72,7 +71,7 @@ class MONGOCXX_API search_index_model { std::unique_ptr _impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/search_index_view.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/search_index_view.hpp index 873881dfa9..c06a6f5571 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/search_index_view.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/search_index_view.hpp @@ -11,8 +11,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing a MongoDB search index view. /// @@ -99,6 +98,8 @@ class MONGOCXX_API search_index_view { /// /// This is a convenience method for creating a single search index with a default name. /// + /// @param session + /// The mongocxx::client_session with which to perform the operation. /// @param definition /// The document describing the search index to be created. /// @@ -263,7 +264,7 @@ class MONGOCXX_API search_index_view { std::unique_ptr _impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/stdx.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/stdx.hpp index c70fe447ca..e073260d5b 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/stdx.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/stdx.hpp @@ -17,14 +17,14 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace stdx { // We adopt all the bsoncxx polyfills using namespace ::bsoncxx::stdx; } // namespace stdx -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/uri.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/uri.hpp index fbd0d7662c..387a844d04 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/uri.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/uri.hpp @@ -27,8 +27,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing a MongoDB connection string URI. /// @@ -371,7 +370,7 @@ class MONGOCXX_API uri { std::unique_ptr _impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/validation_criteria.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/validation_criteria.hpp index da228c5de8..ac76a69d76 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/validation_criteria.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/validation_criteria.hpp @@ -21,8 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Class representing criteria for document validation, to be applied to a collection. /// @@ -151,7 +150,7 @@ MONGOCXX_INLINE validation_criteria::operator bsoncxx::document::value() const { return to_document_deprecated(); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/write_concern.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/write_concern.hpp index b077b0e852..694cb38bdc 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/write_concern.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/write_concern.hpp @@ -28,14 +28,17 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class bulk_write; class client; class collection; class database; class uri; +namespace options { +class transaction; +} + /// /// Class representing the server-side requirement for reporting the success of a write /// operation. The strength of the write concern setting determines the level of guarantees @@ -242,13 +245,13 @@ class MONGOCXX_API write_concern { bsoncxx::document::value to_document() const; private: - friend bulk_write; - friend client; - friend collection; - friend database; - /// \relates mongocxx::options::transaction - friend mongocxx::options::transaction; - friend uri; + friend class bulk_write; + friend class client; + friend class collection; + friend class database; + friend class uri; + + friend class options::transaction; /// /// @{ @@ -270,7 +273,7 @@ class MONGOCXX_API write_concern { std::unique_ptr _impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/write_type.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/write_type.hpp index 5efbb3a13a..c267f5889a 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/write_type.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/write_type.hpp @@ -17,8 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { /// /// Enum representing the the types of write operations that can be performed. /// @@ -42,7 +41,7 @@ enum class write_type { k_replace_one, }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp index 33d15d833c..19f7ea9182 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp @@ -30,8 +30,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { using namespace libbson; using bsoncxx::builder::basic::kvp; @@ -227,5 +226,5 @@ bulk_write::bulk_write(const collection& coll, } } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp index 352a1fd93e..3da974b41a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp @@ -22,8 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { // Requirements for concept Iterator: // https://en.cppreference.com/w/cpp/named_req/Iterator static_assert(std::is_copy_constructible::value, ""); @@ -127,5 +126,5 @@ bool change_stream::iterator::is_exhausted() const { return _change_stream->_impl->is_exhausted(); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp index 357dec0a91..ddfd5d15e1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp @@ -35,8 +35,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { using namespace libbson; using bsoncxx::builder::basic::kvp; @@ -335,5 +334,5 @@ client::impl& client::_get_impl() { return const_cast(cthis->_get_impl()); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp index 8f20dc2d7f..037b5a2abe 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { using mongocxx::libbson::scoped_bson_t; client_encryption::client_encryption(options::client_encryption opts) @@ -96,5 +95,5 @@ stdx::optional client_encryption::remove_key_alt_name( return _impl->remove_key_alt_name(id, key_alt_name); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp index 6e588694ab..d2e940ff21 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp @@ -21,8 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { // Private constructors. client_session::client_session(const class client* client, const mongocxx::options::client_session& options) @@ -101,5 +100,5 @@ client_session::impl& client_session::_get_impl() { return const_cast(cthis->_get_impl()); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp index 9983b52a04..038ca54efe 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp @@ -197,8 +197,7 @@ mongocxx::stdx::optional find_and_modify( } // namespace namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { using namespace libbson; collection::collection() noexcept = default; @@ -1460,5 +1459,5 @@ collection::impl& collection::_get_impl() { return const_cast(cthis->_get_impl()); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/config.hpp.in b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/config.hpp.in index 90a571d0b4..c43b6f4285 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/config.hpp.in +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/config.hpp.in @@ -13,5 +13,4 @@ // limitations under the License. #define MONGOCXX_INLINE_NAMESPACE_BEGIN inline namespace v_noabi { - #define MONGOCXX_INLINE_NAMESPACE_END } // namespace v_noabi diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp index db29641e3d..7e138103b0 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { cursor::cursor(void* cursor_ptr, bsoncxx::stdx::optional cursor_type) : _impl(stdx::make_unique(static_cast(cursor_ptr), cursor_type)) {} @@ -109,5 +108,5 @@ bool MONGOCXX_CALL operator!=(const cursor::iterator& lhs, const cursor::iterato return !(lhs == rhs); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp index cdd1e4464e..69a9ad11ae 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp @@ -41,8 +41,7 @@ using bsoncxx::builder::basic::kvp; using bsoncxx::builder::basic::make_document; namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace { class collection_names { public: @@ -524,5 +523,5 @@ database::impl& database::_get_impl() { return const_cast(cthis->_get_impl()); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp index e9139a7120..3a63c397ed 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp @@ -23,7 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { command_failed_event::command_failed_event(const void* event) : _failed_event(event) {} @@ -79,5 +79,5 @@ std::uint16_t command_failed_event::port() const { } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp index 8076f1ed3b..90801bb124 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp @@ -20,7 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { command_started_event::command_started_event(const void* event) : _started_event(event) {} @@ -76,5 +76,5 @@ std::uint16_t command_started_event::port() const { } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp index 4c1ffd38f4..eb23c1a6b4 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp @@ -20,7 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { command_succeeded_event::command_succeeded_event(const void* event) : _succeeded_event(event) {} @@ -76,5 +76,5 @@ std::uint16_t command_succeeded_event::port() const { } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp index 230a42ce11..7ad03a269b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { heartbeat_failed_event::heartbeat_failed_event(const void* event) : _failed_event(event) {} @@ -53,5 +53,5 @@ bool heartbeat_failed_event::awaited() const { } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp index a5ed887ddf..0f5c8ec7d0 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { heartbeat_started_event::heartbeat_started_event(const void* event) : _started_event(event) {} @@ -41,5 +41,5 @@ bool heartbeat_started_event::awaited() const { } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp index 406d430bdb..753e880fb5 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { heartbeat_succeeded_event::heartbeat_succeeded_event(const void* event) : _succeeded_event(event) {} @@ -53,5 +53,5 @@ bool heartbeat_succeeded_event::awaited() const { } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp index 27a8bbe929..0e7e61563b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { server_changed_event::server_changed_event(const void* event) : _event(event) {} @@ -56,5 +56,5 @@ const server_description server_changed_event::new_description() const { } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp index f0bfbfaca3..829b9bd8b1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { server_closed_event::server_closed_event(const void* event) : _event(event) {} @@ -46,5 +46,5 @@ const bsoncxx::oid server_closed_event::topology_id() const { } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp index 931019b7c8..cc61999e69 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { server_description::server_description(const void* sd) : _sd(sd) {} @@ -59,5 +59,5 @@ std::uint16_t server_description::port() const { } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp index 5ebaf89840..5cc6133967 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { server_opening_event::server_opening_event(const void* event) : _event(event) {} @@ -46,5 +46,5 @@ const bsoncxx::oid server_opening_event::topology_id() const { } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp index 946de33a3b..2de3216414 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { topology_changed_event::topology_changed_event(const void* event) : _event(event) {} @@ -46,5 +46,5 @@ topology_description topology_changed_event::new_description() const { } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp index 11a91c966f..d78ad1d1ff 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { topology_closed_event::topology_closed_event(const void* event) : _event(event) {} @@ -33,5 +33,5 @@ bsoncxx::oid topology_closed_event::topology_id() const { } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp index ef2b1afe8a..67d3a5111a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp @@ -19,7 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { topology_description::server_descriptions::server_descriptions( @@ -105,5 +105,5 @@ topology_description::server_descriptions topology_description::servers() const } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp index f32447a98d..dd11ed37f5 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace events { topology_opening_event::topology_opening_event(const void* event) : _event(event) {} @@ -33,5 +33,5 @@ bsoncxx::oid topology_opening_event::topology_id() const { } } // namespace events -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp index ad8cd1ea9c..7ef22a7082 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp @@ -19,8 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace { // @@ -105,5 +104,5 @@ const std::error_category& MONGOCXX_CALL error_category() { return category; } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp index 5712a97138..2983cfb2f8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { operation_exception::operation_exception(std::error_code ec, bsoncxx::document::value&& raw_server_error, std::string what_arg) @@ -48,5 +47,5 @@ bool operation_exception::has_error_label(stdx::string_view label) const { return libmongoc::error_has_label(error.bson(), label_str.c_str()); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh index 0ddf15d1db..cdd5c95e8d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh @@ -22,8 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { inline std::error_code make_error_code(int code, int) { // Domain is ignored. We simply issue the code. return {code, server_error_category()}; @@ -63,7 +62,7 @@ void throw_exception(bsoncxx::document::value raw_server_error, const ::bson_err throw exception_type{make_error_code(error), std::move(raw_server_error), error.message}; } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp index 22730c1a78..f34fabcf85 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp @@ -19,8 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace { // @@ -44,5 +43,5 @@ const std::error_category& MONGOCXX_CALL server_error_category() { return category; } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp index c2d58965e4..e84661aebc 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp @@ -35,7 +35,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace gridfs { namespace { @@ -562,5 +562,5 @@ bucket::impl& bucket::_get_impl() { } } // namespace gridfs -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp index 8a6a94693e..fe0264be46 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp @@ -28,7 +28,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace gridfs { downloader::downloader(stdx::optional chunks, @@ -193,5 +193,5 @@ downloader::impl& downloader::_get_impl() { } } // namespace gridfs -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh index 21176b07ef..c64dbf5988 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh @@ -23,7 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace gridfs { class bucket::impl { @@ -55,7 +55,7 @@ class bucket::impl { }; } // namespace gridfs -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh index e6d2d2f9fe..17de6fbc9f 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace gridfs { class downloader::impl { @@ -108,7 +108,7 @@ class downloader::impl { }; } // namespace gridfs -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh index 8af73d8b74..6ddb134978 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh @@ -24,7 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace gridfs { class uploader::impl { @@ -86,7 +86,7 @@ class uploader::impl { }; } // namespace gridfs -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp index 98d343ebfc..2c6abf883f 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp @@ -37,7 +37,7 @@ std::size_t chunks_collection_documents_max_length(std::size_t chunk_size) { } // namespace namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace gridfs { uploader::uploader(const client_session* session, @@ -210,5 +210,5 @@ uploader::impl& uploader::_get_impl() { } } // namespace gridfs -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp index 09a7c6ee3e..2a31fbd8f2 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp @@ -24,8 +24,7 @@ using bsoncxx::builder::basic::kvp; using bsoncxx::builder::basic::sub_document; namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { hint::hint(bsoncxx::document::view_or_value index) : _index_doc(std::move(index)) {} hint::hint(bsoncxx::string::view_or_value index) : _index_string(std::move(index)) {} @@ -70,5 +69,5 @@ bool MONGOCXX_CALL operator!=(bsoncxx::document::view index, const hint& index_h return !(index_hint == index); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp index 816ae85fd8..f31a276d25 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp @@ -17,8 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { index_model::index_model(const bsoncxx::document::view_or_value& keys, const bsoncxx::document::view_or_value& options) : _keys{keys.view()}, _options{options.view()} {} @@ -39,5 +38,5 @@ bsoncxx::document::view index_model::options() const { return _options.view(); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp index f1e9281100..eaed7e3ff8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { index_view::index_view(void* coll, void* client) : _impl{stdx::make_unique(static_cast(coll), static_cast(client))} {} @@ -136,5 +135,5 @@ index_view::impl& index_view::_get_impl() { return *_impl; } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp index a42253183e..0d366226eb 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp @@ -31,8 +31,7 @@ #endif namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace { log_level convert_log_level(::mongoc_log_level_t mongoc_log_level) { @@ -163,5 +162,5 @@ instance& instance::current() { return *curr; } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp index 6c413ecbc2..114d8d085e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp @@ -17,8 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { stdx::string_view MONGOCXX_CALL to_string(log_level level) { switch (level) { case log_level::k_error: @@ -43,5 +42,5 @@ stdx::string_view MONGOCXX_CALL to_string(log_level level) { logger::logger() = default; logger::~logger() = default; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp index eb3d3ab0a2..4ad8b41982 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace model { delete_many::delete_many(bsoncxx::document::view_or_value filter) : _filter(std::move(filter)) {} @@ -45,5 +45,5 @@ const stdx::optional& delete_many::collation() } } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp index fa037f0272..35f3abe15d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace model { delete_one::delete_one(bsoncxx::document::view_or_value filter) : _filter(std::move(filter)) {} @@ -45,5 +45,5 @@ const stdx::optional& delete_one::hint() const { } } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp index 32bbf6c068..aa59972349 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace model { insert_one::insert_one(bsoncxx::document::view_or_value document) @@ -28,5 +28,5 @@ const bsoncxx::document::view_or_value& insert_one::document() const { } } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp index 596f7a453f..20c4d8588c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace model { replace_one::replace_one(bsoncxx::document::view_or_value filter, @@ -60,5 +60,5 @@ const stdx::optional& replace_one::hint() const { return _hint; } } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp index 54d28cfcf0..e090225118 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace model { update_many::update_many(bsoncxx::document::view_or_value filter, @@ -77,5 +77,5 @@ const stdx::optional& update_many::array_filters( } } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp index 16ba7f998d..9e0f95267a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace model { update_one::update_one(bsoncxx::document::view_or_value filter, @@ -77,5 +77,5 @@ const stdx::optional& update_one::array_filters() } } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp index 8c98d15d65..c54d57d281 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp @@ -19,7 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace model { write::write(insert_one value) : _type(write_type::k_insert_one), _insert_one(std::move(value)) { @@ -162,5 +162,5 @@ write::~write() { } } // namespace model -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp index 789ce67ffb..4122c0cfab 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp @@ -20,7 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { using bsoncxx::builder::basic::kvp; @@ -129,5 +129,5 @@ const stdx::optional& aggregate::comm } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp index 5406e9055a..46b9770ba7 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { apm& apm::on_command_started( @@ -153,5 +153,5 @@ apm::heartbeat_succeeded() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp index 4a7ff0e6e2..b3f1c9ae50 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp @@ -25,7 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { auto_encryption::auto_encryption() noexcept : _bypass(false), _bypass_query_analysis(false) {} @@ -190,5 +190,5 @@ void* auto_encryption::convert() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp index 9c1084fd55..5c8a34afbd 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { bulk_write::bulk_write() : _ordered(true) {} @@ -68,5 +68,5 @@ const stdx::optional bulk_write::comm } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp index 62445ae441..9c6ecf7642 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { change_stream::change_stream() = default; @@ -147,5 +147,5 @@ bsoncxx::document::value change_stream::as_bson() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp index e81c143782..f66812f895 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { client& client::tls_opts(tls tls_opts) { @@ -65,5 +65,5 @@ const stdx::optional& client::server_api_opts() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp index b7e2bbfa89..faa4e46a7c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp @@ -21,7 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { client_encryption& client_encryption::key_vault_client(mongocxx::client* client) { @@ -89,5 +89,5 @@ void* client_encryption::convert() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp index e2197fee1e..32180c5320 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { client_session& client_session::causal_consistency(bool causal_consistency) noexcept { @@ -52,5 +52,5 @@ const stdx::optional& client_session::default_transaction_opts() co } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp index a3a4128489..33d91bf695 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { count& count::collation(bsoncxx::document::view_or_value collation) { @@ -85,5 +85,5 @@ const stdx::optional& count::read_preference() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/create_collection.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/create_collection.cpp index ee3312fc71..0b894e3108 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/create_collection.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/create_collection.cpp @@ -24,7 +24,7 @@ using bsoncxx::builder::concatenate; using bsoncxx::builder::basic::kvp; namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { create_collection_deprecated& create_collection_deprecated::capped(bool capped) { @@ -135,5 +135,5 @@ bsoncxx::document::value create_collection_deprecated::to_document() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp index 574cecf7e1..1e2e52d2bf 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp @@ -19,7 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { data_key& data_key::master_key(bsoncxx::document::view_or_value master_key) { @@ -83,5 +83,5 @@ const stdx::optional& data_key::key_material() { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp index 159ec4d844..f55cb3ecc8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { delete_options& delete_options::collation(bsoncxx::document::view_or_value collation) { @@ -67,5 +67,5 @@ const stdx::optional delete_options:: } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp index db143c8708..4759abf240 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { distinct& distinct::collation(bsoncxx::document::view_or_value collation) { @@ -58,5 +58,5 @@ const stdx::optional& distinct::read_preference() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp index a2e59b5e0a..f6c73ffacb 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp @@ -24,7 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { encrypt& encrypt::key_id(bsoncxx::types::bson_value::view_or_value key_id) { @@ -257,5 +257,5 @@ void* encrypt::convert() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp index d960c08e16..78e9352dab 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { estimated_document_count& estimated_document_count::max_time(std::chrono::milliseconds max_time) { @@ -51,5 +51,5 @@ const stdx::optional& estimated_document_count::read_preference } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp index 3202bda344..903ce3cf4e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { find& find::allow_disk_use(bool allow_disk_use) { @@ -211,5 +211,5 @@ const stdx::optional& find::read_preference() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp index 92e4f22af8..23ce31ab2c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { find_one_and_delete& find_one_and_delete::collation(bsoncxx::document::view_or_value collation) { @@ -95,5 +95,5 @@ const stdx::optional find_one_and_del } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp index ddc12bf81b..8962a258bc 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { find_one_and_replace& find_one_and_replace::bypass_document_validation( @@ -126,5 +126,5 @@ const stdx::optional& find_one_and_replace::write_conce } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp index ee6f170523..d8ed6a709d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { find_one_and_update& find_one_and_update::bypass_document_validation( @@ -135,5 +135,5 @@ const stdx::optional& find_one_and_update::array_ } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp index 0d64096bbd..ec4a320c99 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { namespace gridfs { @@ -73,5 +73,5 @@ const stdx::optional& bucket::write_concern() const { } // namespace gridfs } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp index 5624be5259..57fbf1db8d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { namespace gridfs { @@ -42,5 +42,5 @@ const stdx::optional& upload::metadata() const } // namespace gridfs } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp index 8c0c36cc5b..2e91ff4cb2 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { index::index() = default; @@ -320,7 +320,7 @@ int index::wiredtiger_storage_options::type() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp index 6e1d8e935d..c61cc7a3d8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp @@ -23,7 +23,7 @@ using bsoncxx::builder::basic::kvp; using bsoncxx::builder::basic::make_document; namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { index_view::index_view() : _max_time(), _write_concern(), _commit_quorum() {} @@ -63,5 +63,5 @@ index_view& index_view::commit_quorum(std::string commit_quorum) { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp index 7bce7a031e..576b10076e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { insert& insert::bypass_document_validation(bool bypass_document_validation) { @@ -57,5 +57,5 @@ const stdx::optional& insert::comment } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp index 175536383f..9889cbece7 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { pool::pool(client client_opts) { @@ -29,5 +29,5 @@ const client& pool::client_opts() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh index cffb77846a..36a497331c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { using apm_unique_callbacks = @@ -168,7 +168,7 @@ static apm_unique_callbacks make_apm_callbacks(const apm& apm_opts) { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh index fbc30bbbce..bb1fc1073b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh @@ -21,7 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { using unique_server_api = @@ -57,7 +57,7 @@ static unique_server_api make_server_api(const server_api& opts) { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh index 3c9e627f06..b4d8f7c7f5 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { #if defined(MONGOCXX_ENABLE_SSL) && defined(MONGOC_ENABLE_SSL) @@ -54,7 +54,7 @@ inline std::pair<::mongoc_ssl_opt_t, std::list> #endif } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh index 8cff8daeac..cd16618ac5 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh @@ -24,7 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { class transaction::impl { @@ -129,7 +129,7 @@ class transaction::impl { }; } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/range.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/range.cpp index fc2effda3c..208f7acba5 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/range.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/range.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { range& range::min(bsoncxx::types::bson_value::view_or_value value) { @@ -57,5 +57,5 @@ const stdx::optional& range::precision() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp index 4ca853aad5..eecad35013 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { replace& replace::bypass_document_validation(bool bypass_document_validation) { @@ -85,5 +85,5 @@ const stdx::optional& replace::write_concern() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp index 0ee398b061..e045c471aa 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp @@ -22,7 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { rewrap_many_datakey& rewrap_many_datakey::provider(bsoncxx::string::view_or_value provider) { @@ -44,5 +44,5 @@ const stdx::optional& rewrap_many_datakey::mas } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp index 058312a1bd..343396e49a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp @@ -24,7 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { std::string server_api::version_to_string(server_api::version version) { @@ -70,5 +70,5 @@ server_api::version server_api::get_version() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp index 303f1a0676..e12b0a0f4f 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { tls& tls::pem_file(bsoncxx::string::view_or_value pem_file) { @@ -75,5 +75,5 @@ const stdx::optional& tls::allow_invalid_certificates() const { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp index 2949d855b4..ddd0ed9bb7 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace options { transaction::transaction() : _impl{stdx::make_unique()} {} @@ -88,7 +87,7 @@ transaction::impl& transaction::_get_impl() { } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp index f40c34b643..15a9a6c426 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp @@ -19,7 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace options { update& update::bypass_document_validation(bool bypass_document_validation) { @@ -95,5 +95,5 @@ const stdx::optional& update::array_filters() con } } // namespace options -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp index 3458358bbd..a1c55500c8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp @@ -25,8 +25,7 @@ using bsoncxx::builder::basic::kvp; using bsoncxx::builder::basic::sub_document; namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { pipeline::pipeline() : _impl(stdx::make_unique()) {} pipeline::pipeline(pipeline&&) noexcept = default; @@ -255,5 +254,5 @@ bsoncxx::array::view pipeline::view_array() const { return _impl->view_array(); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp index e8a1a2cc8f..02458fcc1e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp @@ -31,8 +31,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { // Attempts to create a new client pool using the uri. Throws an exception upon error. static mongoc_client_pool_t* construct_client_pool(mongoc_uri_t* uri) { bson_error_t error; @@ -144,5 +143,5 @@ stdx::optional pool::try_acquire() { entry::unique_client(new client(cli), [this](client* client) { _release(client); })); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/append_aggregate_options.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/append_aggregate_options.hh index 954e2e7771..edb8e87f1e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/append_aggregate_options.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/append_aggregate_options.hh @@ -6,8 +6,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { MONGOCXX_INLINE void append_aggregate_options(bsoncxx::builder::basic::document& builder, const options::aggregate& options) { using bsoncxx::builder::basic::kvp; @@ -52,5 +51,5 @@ MONGOCXX_INLINE void append_aggregate_options(bsoncxx::builder::basic::document& builder.append(kvp("comment", *comment)); } } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/bulk_write.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/bulk_write.hh index 19c2ff2b33..3e54cace5d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/bulk_write.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/bulk_write.hh @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class bulk_write::impl { public: impl(mongoc_bulk_operation_t* op) : operation_t(op) {} @@ -33,7 +32,7 @@ class bulk_write::impl { mongoc_bulk_operation_t* operation_t; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/change_stream.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/change_stream.hh index a688684f44..a6fbfeb38d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/change_stream.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/change_stream.hh @@ -25,8 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class change_stream::impl { public: // lifecycle of the cursor @@ -119,7 +118,7 @@ class change_stream::impl { bool exhausted_; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client.hh index 3f8ac836b0..2d1b6eb298 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client.hh @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client::impl { public: impl(mongoc_client_t* client) : client_t(client) {} @@ -38,7 +37,7 @@ class client::impl { options::apm listeners; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh index 45f7a46ad1..4014fbb375 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh @@ -36,8 +36,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client_encryption::impl { private: using scoped_bson_t = mongocxx::libbson::scoped_bson_t; @@ -397,7 +396,7 @@ class client_encryption::impl { std::unique_ptr _client_encryption; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_session.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_session.hh index 68991db153..05bda3f499 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_session.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_session.hh @@ -31,8 +31,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace { struct with_transaction_ctx { client_session* parent; @@ -250,7 +249,7 @@ class client_session::impl { bson_t _empty_cluster_time = BSON_INITIALIZER; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/collection.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/collection.hh index 5d17c2468a..b48fc96103 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/collection.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/collection.hh @@ -27,8 +27,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class collection::impl { public: impl(mongoc_collection_t* collection, @@ -62,7 +61,7 @@ class collection::impl { const class client::impl* client_impl; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.cpp index 3ba3bb84a8..c1c7029dcd 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace libmongoc { namespace conversions { @@ -57,5 +57,5 @@ read_preference::read_mode read_mode_from_read_mode_t(mongoc_read_mode_t read_mo } // namespace conversions } // namespace libmongoc -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.hh index ad9397f767..058c4b1403 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.hh @@ -21,7 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace libmongoc { namespace conversions { @@ -33,7 +33,7 @@ MONGOCXX_TEST_API read_preference::read_mode read_mode_from_read_mode_t( } // namespace conversions } // namespace libmongoc -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/cursor.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/cursor.hh index b4f2a939d0..93f3925ead 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/cursor.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/cursor.hh @@ -22,8 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class cursor::impl { public: // States represent a one-way, ordered lifecycle of a cursor. k_started means that @@ -82,7 +81,7 @@ class cursor::impl { bool tailable; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/database.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/database.hh index fc29c020e2..9e98eb64f2 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/database.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/database.hh @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class database::impl { public: impl(mongoc_database_t* db, const class client::impl* client, std::string name) @@ -55,7 +54,7 @@ class database::impl { std::string name; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/index_view.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/index_view.hh index 61f041c0a7..c09ca5dbf5 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/index_view.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/index_view.hh @@ -33,8 +33,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { using bsoncxx::builder::basic::kvp; using bsoncxx::builder::basic::make_document; @@ -270,5 +269,5 @@ class index_view::impl { mongoc_server_description_t* sd; }; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.cpp index 8ede9f8390..ff8f68c406 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace libbson { namespace { @@ -126,5 +126,5 @@ bsoncxx::document::value scoped_bson_t::steal() { } } // namespace libbson -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.hh index 97f4db649f..a1d356efca 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.hh @@ -25,7 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace libbson { // @@ -135,7 +135,7 @@ class MONGOCXX_TEST_API scoped_bson_t { }; } // namespace libbson -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.cpp index 2c4d131ac4..bf42167966 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace libmongoc { #ifdef MONGOCXX_TESTING @@ -41,5 +41,5 @@ namespace libmongoc { #endif // MONGOCXX_TESTING } // namespace libmongoc -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.hh index e24320f20c..392422b2cf 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.hh @@ -39,7 +39,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace libmongoc { #ifdef MONGOCXX_TESTING @@ -70,7 +70,7 @@ namespace libmongoc { #endif } // namespace libmongoc -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.cpp index 77159be9c9..4d7dda7461 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.cpp @@ -19,8 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { bool size_t_to_int64_safe(const std::size_t in, int64_t& out) { if (sizeof(in) >= sizeof(int64_t)) { if (in > static_cast(std::numeric_limits::max())) { @@ -68,5 +67,5 @@ bool int64_to_size_t_safe(const int64_t in, std::size_t& out) { return true; } -MONGOCXX_INLINE_NAMESPACE_END -} // namespace mongocxx \ No newline at end of file +} // namespace v_noabi +} // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.hh index e170f95617..874ffcc540 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.hh @@ -22,8 +22,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { // size_t_to_int64_safe checks if @in is within the bounds of an int64_t. // If yes, it safely casts into @out and returns true. // If no, @out is not modified and returns false. @@ -48,7 +47,7 @@ bool int32_to_size_t_safe(const int32_t in, std::size_t& out); MONGOCXX_TEST_API bool int64_to_size_t_safe(const int64_t in, std::size_t& out); -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pipeline.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pipeline.hh index 987208d5c5..c006ab6f77 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pipeline.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pipeline.hh @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class pipeline::impl { public: bsoncxx::builder::basic::array& sink() { @@ -43,7 +42,7 @@ class pipeline::impl { bsoncxx::builder::basic::array _builder; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pool.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pool.hh index 02f518dced..536c570058 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pool.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pool.hh @@ -23,8 +23,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class pool::impl { public: impl(mongoc_client_pool_t* pool) : client_pool_t(pool) {} @@ -38,7 +37,7 @@ class pool::impl { options::apm listeners; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_concern.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_concern.hh index fb77fa6a21..fe15c653e3 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_concern.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_concern.hh @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class read_concern::impl { public: impl(::mongoc_read_concern_t* read_concern) : read_concern_t{read_concern} {} @@ -33,7 +32,7 @@ class read_concern::impl { ::mongoc_read_concern_t* read_concern_t; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_preference.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_preference.hh index d207d7545d..1bb2f6580a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_preference.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_preference.hh @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class read_preference::impl { public: impl(mongoc_read_prefs_t* read_pref) : read_preference_t(read_pref) {} @@ -33,7 +32,7 @@ class read_preference::impl { mongoc_read_prefs_t* read_preference_t; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_model.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_model.hh index c7502ef1d4..a6d08bbd64 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_model.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_model.hh @@ -6,8 +6,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class search_index_model::impl { public: impl(bsoncxx::document::view_or_value definition) : _definition(definition.view()) {} @@ -18,5 +17,5 @@ class search_index_model::impl { bsoncxx::document::view_or_value _definition; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_view.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_view.hh index 9039c103f4..148aa460c6 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_view.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_view.hh @@ -14,8 +14,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { using bsoncxx::builder::basic::kvp; using bsoncxx::builder::basic::make_document; @@ -179,5 +178,5 @@ class search_index_view::impl { mongoc_collection_t* _coll; mongoc_client_t* _client; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/uri.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/uri.hh index 30e9de9e59..db05e2f063 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/uri.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/uri.hh @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class uri::impl { public: impl(mongoc_uri_t* uri) : uri_t(uri) {} @@ -31,7 +30,7 @@ class uri::impl { mongoc_uri_t* uri_t; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/write_concern.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/write_concern.hh index 6f1116274e..a2e6808f7b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/write_concern.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/write_concern.hh @@ -20,8 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class write_concern::impl { public: impl(mongoc_write_concern_t* write_concern) : write_concern_t(write_concern) {} @@ -33,7 +32,7 @@ class write_concern::impl { mongoc_write_concern_t* write_concern_t; }; -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp index 7e4cbca122..594ecc4b45 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp @@ -24,8 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { read_concern::read_concern() : _impl{stdx::make_unique(libmongoc::read_concern_new())} {} read_concern::read_concern(std::unique_ptr&& implementation) @@ -131,5 +130,5 @@ bool MONGOCXX_CALL operator!=(const read_concern& lhs, const read_concern& rhs) return !(lhs == rhs); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp index d04dd27a68..fe9f34375a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp @@ -25,8 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { read_preference::read_preference(read_preference&&) noexcept = default; read_preference& read_preference::operator=(read_preference&&) noexcept = default; @@ -147,5 +146,5 @@ bool MONGOCXX_CALL operator!=(const read_preference& lhs, const read_preference& return !(lhs == rhs); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp index d4131fdfb3..842f3c74a1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { bulk_write::bulk_write(bsoncxx::document::value raw_response) @@ -68,5 +68,5 @@ bool MONGOCXX_CALL operator!=(const bulk_write& lhs, const bulk_write& rhs) { } } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp index 674a988a8d..0cfd9b65a7 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { delete_result::delete_result(result::bulk_write result) : _result(std::move(result)) {} @@ -38,5 +38,5 @@ bool MONGOCXX_CALL operator!=(const delete_result& lhs, const delete_result& rhs } } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp index 64ea00c5c5..bf32723330 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { namespace gridfs { @@ -38,5 +38,5 @@ bool MONGOCXX_CALL operator!=(const upload& lhs, const upload& rhs) { } // namespace gridfs } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp index 12799ee493..2e8be0ef33 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { insert_many::insert_many(result::bulk_write result, bsoncxx::array::value inserted_ids) @@ -77,5 +77,5 @@ bool MONGOCXX_CALL operator!=(const insert_many& lhs, const insert_many& rhs) { } } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp index 2a0ffa6f6c..75ee336a1a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp @@ -18,7 +18,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { insert_one::insert_one(result::bulk_write result, bsoncxx::types::bson_value::view inserted_id) @@ -42,5 +42,5 @@ bool MONGOCXX_CALL operator!=(const insert_one& lhs, const insert_one& rhs) { } } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp index c0a0d4234a..f445394284 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { replace_one::replace_one(result::bulk_write result) : _result(std::move(result)) {} @@ -49,5 +49,5 @@ bool MONGOCXX_CALL operator!=(const replace_one& lhs, const replace_one& rhs) { } } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp index b6899695f1..80b355acc2 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp @@ -19,7 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { rewrap_many_datakey::rewrap_many_datakey(mongocxx::result::bulk_write bulk_write_result_doc) { @@ -31,5 +31,5 @@ const bsoncxx::stdx::optional& rewrap_many_datakey } } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp index 46359d3f17..86a2752720 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp @@ -17,7 +17,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace result { update::update(result::bulk_write result) : _result(std::move(result)) {} @@ -52,5 +52,5 @@ bool MONGOCXX_CALL operator!=(const update& lhs, const update& rhs) { } } // namespace result -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp index a3e7d4e073..d747923ba7 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp @@ -7,8 +7,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { search_index_model::search_index_model(bsoncxx::document::view_or_value definition) : _impl{bsoncxx::stdx::make_unique(definition)} {} search_index_model::search_index_model(bsoncxx::string::view_or_value name, @@ -49,5 +48,5 @@ search_index_model::impl& search_index_model::_get_impl() { return const_cast(cthis->_get_impl()); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp index 087d12480f..054c4c694f 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp @@ -7,8 +7,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { search_index_view::search_index_view(void* coll, void* client) : _impl{stdx::make_unique(static_cast(coll), static_cast(client))} {} @@ -128,5 +127,5 @@ search_index_view::impl& search_index_view::_get_impl() { return const_cast(cthis->_get_impl()); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/mock.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/mock.hh index d3d8d9344c..a816428bf9 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/mock.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/mock.hh @@ -29,7 +29,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace test_util { template @@ -185,7 +185,7 @@ class mock { }; } // namespace test_util -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp index 370e5308fb..dec9d5549b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp @@ -26,8 +26,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace { // Some of the 'uri_get_*' string accessors may return nullptr. Check for this case and convert to @@ -299,5 +298,5 @@ stdx::optional uri::zlib_compression_level() const { return _int32_option(_impl->uri_t, "zlibCompressionLevel"); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp index 3710673363..a3ad09f6f7 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp @@ -50,8 +50,7 @@ std::string validation_action_to_string(mongocxx::validation_criteria::validatio } // namespace namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { validation_criteria& validation_criteria::rule(bsoncxx::document::view_or_value rule) { _rule = std::move(rule); return *this; @@ -111,5 +110,5 @@ MONGOCXX_API bool MONGOCXX_CALL operator!=(const validation_criteria& lhs, return !(lhs == rhs); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp index a1e39d51d4..572522b631 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp @@ -25,8 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { write_concern::write_concern() : _impl{stdx::make_unique(libmongoc::write_concern_new())} {} write_concern::write_concern(std::unique_ptr&& implementation) { @@ -210,5 +209,5 @@ bool MONGOCXX_CALL operator!=(const write_concern& lhs, const write_concern& rhs return !(lhs == rhs); } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/test/client_helpers.cpp b/src/mongocxx/test/client_helpers.cpp index 66dc2e888c..39f00bfcd7 100644 --- a/src/mongocxx/test/client_helpers.cpp +++ b/src/mongocxx/test/client_helpers.cpp @@ -41,7 +41,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace test_util { namespace { @@ -552,5 +552,5 @@ std::string getenv_or_fail(const std::string env_name) { } } // namespace test_util -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/test/client_helpers.hh b/src/mongocxx/test/client_helpers.hh index eef17d5086..305a8ee40e 100644 --- a/src/mongocxx/test/client_helpers.hh +++ b/src/mongocxx/test/client_helpers.hh @@ -36,8 +36,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { class client; namespace test_util { @@ -229,7 +228,7 @@ std::string getenv_or_fail(const std::string env_name); } // namespace test_util -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/test/spec/monitoring.cpp b/src/mongocxx/test/spec/monitoring.cpp index 5979c391cd..2d0246bb13 100644 --- a/src/mongocxx/test/spec/monitoring.cpp +++ b/src/mongocxx/test/spec/monitoring.cpp @@ -27,7 +27,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace spec { using namespace mongocxx; @@ -350,6 +350,6 @@ void apm_checker::clear() { } } // namespace spec -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/test/spec/monitoring.hh b/src/mongocxx/test/spec/monitoring.hh index 36c000e76b..2894b99214 100644 --- a/src/mongocxx/test/spec/monitoring.hh +++ b/src/mongocxx/test/spec/monitoring.hh @@ -21,7 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace spec { using namespace mongocxx; @@ -87,6 +87,6 @@ class apm_checker { }; } // namespace spec -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/test/spec/operation.cpp b/src/mongocxx/test/spec/operation.cpp index ec6f8042d0..da309651fe 100644 --- a/src/mongocxx/test/spec/operation.cpp +++ b/src/mongocxx/test/spec/operation.cpp @@ -45,7 +45,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace spec { using namespace mongocxx; @@ -1508,7 +1508,7 @@ document::value operation_runner::run(document::view operation) { } } // namespace spec -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/test/spec/operation.hh b/src/mongocxx/test/spec/operation.hh index 61f2deac41..0e1d030a77 100644 --- a/src/mongocxx/test/spec/operation.hh +++ b/src/mongocxx/test/spec/operation.hh @@ -26,7 +26,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace spec { using namespace bsoncxx; @@ -85,6 +85,6 @@ class operation_runner { }; } // namespace spec -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/test/spec/unified_tests/assert.hh b/src/mongocxx/test/spec/unified_tests/assert.hh index edceb51d12..d8628c9763 100644 --- a/src/mongocxx/test/spec/unified_tests/assert.hh +++ b/src/mongocxx/test/spec/unified_tests/assert.hh @@ -20,7 +20,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace assert { void matches(bsoncxx::types::bson_value::view actual, @@ -30,7 +30,7 @@ void matches(bsoncxx::types::bson_value::view actual, bool is_array_of_root_docs = false); } // namespace assert -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/test/spec/unified_tests/entity.cpp b/src/mongocxx/test/spec/unified_tests/entity.cpp index 46b5922a13..287760ef90 100644 --- a/src/mongocxx/test/spec/unified_tests/entity.cpp +++ b/src/mongocxx/test/spec/unified_tests/entity.cpp @@ -19,7 +19,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace entity { template @@ -151,5 +151,5 @@ void map::erase(const key_type& key) { } } // namespace entity -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/test/spec/unified_tests/entity.hh b/src/mongocxx/test/spec/unified_tests/entity.hh index 387ea43b7d..69a211363d 100644 --- a/src/mongocxx/test/spec/unified_tests/entity.hh +++ b/src/mongocxx/test/spec/unified_tests/entity.hh @@ -24,8 +24,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace entity { class map { @@ -87,7 +86,7 @@ class map { std::unordered_map _client_encryption_map; }; } // namespace entity -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/test/spec/unified_tests/operations.cpp b/src/mongocxx/test/spec/unified_tests/operations.cpp index 65f69642ab..c4ff661d1e 100644 --- a/src/mongocxx/test/spec/unified_tests/operations.cpp +++ b/src/mongocxx/test/spec/unified_tests/operations.cpp @@ -27,8 +27,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { using namespace bsoncxx; using builder::basic::kvp; @@ -2291,5 +2290,5 @@ document::value operations::run(entity::map& entity_map, throw std::logic_error{"unsupported operation: " + name}; } -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/test/spec/unified_tests/operations.hh b/src/mongocxx/test/spec/unified_tests/operations.hh index 2c900ec0a5..b2c7c23538 100644 --- a/src/mongocxx/test/spec/unified_tests/operations.hh +++ b/src/mongocxx/test/spec/unified_tests/operations.hh @@ -25,8 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN - +inline namespace v_noabi { namespace operations { struct state { @@ -49,5 +48,5 @@ bsoncxx::stdx::optional lookup_read_preference(bsoncxx::documen } // namespace operations -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx diff --git a/src/mongocxx/test/spec/util.cpp b/src/mongocxx/test/spec/util.cpp index 49ad9a709e..2e2af9b160 100644 --- a/src/mongocxx/test/spec/util.cpp +++ b/src/mongocxx/test/spec/util.cpp @@ -45,7 +45,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace spec { using namespace bsoncxx; @@ -1137,7 +1137,7 @@ void run_crud_tests_in_file(const std::string& test_path, uri test_uri) { } } // namespace spec -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/mongocxx/test/spec/util.hh b/src/mongocxx/test/spec/util.hh index c973be6ba8..b71d668c35 100644 --- a/src/mongocxx/test/spec/util.hh +++ b/src/mongocxx/test/spec/util.hh @@ -25,7 +25,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace spec { using namespace bsoncxx; @@ -117,6 +117,6 @@ void run_transactions_tests_in_file(const std::string& test_path); void run_crud_tests_in_file(const std::string& test_path, uri test_uri = uri{}); } // namespace spec -MONGOCXX_INLINE_NAMESPACE_END +} // namespace v_noabi } // namespace mongocxx #include diff --git a/src/third_party/catch/include/helpers.hpp b/src/third_party/catch/include/helpers.hpp index ba66d06e4f..0e0ba128e3 100644 --- a/src/third_party/catch/include/helpers.hpp +++ b/src/third_party/catch/include/helpers.hpp @@ -21,7 +21,7 @@ #include namespace mongocxx { -MONGOCXX_INLINE_NAMESPACE_BEGIN +inline namespace v_noabi { namespace test_util { // Check that an error message includes a substring, case-insensitively. Use like: @@ -42,7 +42,7 @@ class mongocxx_exception_matcher : public Catch::MatcherBase