CXX-3160 Remove mongocxx::stdx

CHANGELOG.md

@@ -9,7 +9,11 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu
 
 ## 4.0.0 [Unreleased]
 
-<!-- Will contain entries for the next minor release. -->
+## Removed
+
+- Redeclarations of `bsoncxx::stdx` interfaces in the `mongocxx::stdx` namespace.
+  - Use `bsoncxx::stdx::optional<T>` instead of `mongocxx::stdx::optional<T>`.
+  - Use `bsoncxx::stdx::string_view` instead of `mongocxx::stdx::string_view`.
 
 ## 3.11.0
 

examples/mongocxx/tutorial.cpp

@@ -12,7 +12,6 @@
 
 #include <mongocxx/client.hpp>
 #include <mongocxx/instance.hpp>
-#include <mongocxx/stdx.hpp>
 #include <mongocxx/uri.hpp>
 
 #include <examples/macros.hh>

examples/mongocxx/view_or_value_variant.cpp

@@ -18,7 +18,6 @@
 
 #include <mongocxx/client.hpp>
 #include <mongocxx/instance.hpp>
-#include <mongocxx/stdx.hpp>
 #include <mongocxx/uri.hpp>
 
 #include <examples/macros.hh>

src/mongocxx/include/mongocxx/doc.hpp

@@ -74,17 +74,6 @@
 /// Declares entities representing the result of GridFS commands.
 ///
 
-///
-/// @namespace mongocxx::stdx
-/// Redeclares @ref bsoncxx C++17 standard library polyfills in the @ref mongocxx library namespace
-/// for internal use.
-///
-/// @deprecated Use @ref bsoncxx::stdx instead.
-///
-/// @warning These redeclarations are for internal use only! Users should reference entities
-/// declared in @ref bsoncxx directly, not through @ref mongocxx.
-///
-
 ///
 /// @page topic-mongocxx The mongocxx Library
 /// @brief Topics relating to the mongocxx library.

src/mongocxx/include/mongocxx/v_noabi/mongocxx/bulk_write.hpp

@@ -100,7 +100,7 @@ class bulk_write {
     /// @see
     /// - https://www.mongodb.com/docs/manual/core/bulk-write-operations/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(stdx::optional<result::bulk_write>) execute() const;
+    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::stdx::optional<result::bulk_write>) execute() const;
 
    private:
     friend ::mongocxx::v_noabi::collection;

src/mongocxx/include/mongocxx/v_noabi/mongocxx/change_stream.hpp

@@ -107,7 +107,7 @@ class change_stream {
     /// @return
     ///   The token.
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view>)
+    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::stdx::optional<bsoncxx::v_noabi::document::view>)
     get_resume_token() const;
 
    private:

src/mongocxx/include/mongocxx/v_noabi/mongocxx/client.hpp

@@ -32,7 +32,6 @@
 #include <mongocxx/options/client_session.hpp>
 #include <mongocxx/read_concern.hpp>
 #include <mongocxx/read_preference.hpp>
-#include <mongocxx/stdx.hpp>
 #include <mongocxx/uri.hpp>
 #include <mongocxx/write_concern.hpp>
 

src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_encryption.hpp

@@ -30,7 +30,6 @@
 #include <mongocxx/options/rewrap_many_datakey.hpp>
 #include <mongocxx/result/delete.hpp>
 #include <mongocxx/result/rewrap_many_datakey.hpp>
-#include <mongocxx/stdx.hpp>
 
 #include <mongocxx/config/prelude.hpp>
 
@@ -106,13 +105,13 @@ class client_encryption {
      * @return collection A handle to the newly created collection
      */
     MONGOCXX_ABI_EXPORT_CDECL(collection)
-    create_encrypted_collection(
-        const database& db,
-        const std::string& coll_name,
-        const bsoncxx::v_noabi::document::view& options,
-        bsoncxx::v_noabi::document::value& out_options,
-        const std::string& kms_provider,
-        const stdx::optional<bsoncxx::v_noabi::document::view>& masterkey = stdx::nullopt);
+    create_encrypted_collection(const database& db,
+                                const std::string& coll_name,
+                                const bsoncxx::v_noabi::document::view& options,
+                                bsoncxx::v_noabi::document::value& out_options,
+                                const std::string& kms_provider,
+                                const bsoncxx::stdx::optional<bsoncxx::v_noabi::document::view>&
+                                    masterkey = bsoncxx::stdx::nullopt);
 
     ///
     /// Encrypts a BSON value with a given key and algorithm.
@@ -217,7 +216,7 @@ class client_encryption {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/method/KeyVault.getKey/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(stdx::optional<bsoncxx::v_noabi::document::value>)
+    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::stdx::optional<bsoncxx::v_noabi::document::value>)
     get_key(bsoncxx::v_noabi::types::bson_value::view_or_value id);
 
     ///
@@ -247,7 +246,7 @@ class client_encryption {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/method/KeyVault.addKeyAlternateName/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(stdx::optional<bsoncxx::v_noabi::document::value>)
+    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::stdx::optional<bsoncxx::v_noabi::document::value>)
     add_key_alt_name(bsoncxx::v_noabi::types::bson_value::view_or_value id,
                      bsoncxx::v_noabi::string::view_or_value key_alt_name);
 
@@ -266,7 +265,7 @@ class client_encryption {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/method/KeyVault.removeKeyAlternateName/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(stdx::optional<bsoncxx::v_noabi::document::value>)
+    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::stdx::optional<bsoncxx::v_noabi::document::value>)
     remove_key_alt_name(bsoncxx::v_noabi::types::bson_value::view_or_value id,
                         bsoncxx::v_noabi::string::view_or_value key_alt_name);
 
@@ -282,7 +281,7 @@ class client_encryption {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/method/KeyVault.getKeyByAltName/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(stdx::optional<bsoncxx::v_noabi::document::value>)
+    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::stdx::optional<bsoncxx::v_noabi::document::value>)
     get_key_by_alt_name(bsoncxx::v_noabi::string::view_or_value key_alt_name);
 
    private:

src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_session.hpp

@@ -153,7 +153,7 @@ class client_session {
     /// a transaction already in progress.
     ///
     MONGOCXX_ABI_EXPORT_CDECL(void)
-    start_transaction(const stdx::optional<options::transaction>& transaction_opts = {});
+    start_transaction(const bsoncxx::stdx::optional<options::transaction>& transaction_opts = {});
 
     ///
     /// Commits a transaction on the current client session.