v1: find_one_and_update_options (CXX-3237, CXX-3238) (#1534)

Author: eramongodb

src/mongocxx/include/mongocxx/v1/find_one_and_update_options.hpp

@@ -183,7 +183,7 @@ class find_one_and_update_options {
     ///
     /// Set the "returnDocument" field.
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(find_one_and_update_options&) return_document(return_document return_document);
+    MONGOCXX_ABI_EXPORT_CDECL(find_one_and_update_options&) return_document(v1::return_document return_document);
 
     ///
     /// Return the current "returnDocument" field.
@@ -229,6 +229,8 @@ class find_one_and_update_options {
     /// Return the current "arrayFilters" field.
     ///
     MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v1::stdx::optional<bsoncxx::v1::array::view>) array_filters() const;
+
+    class internal;
 };
 
 } // namespace v1

src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_update-fwd.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include <mongocxx/v1/find_one_and_update_options-fwd.hpp> // IWYU pragma: export
+
 #include <mongocxx/config/prelude.hpp>
 
 namespace mongocxx {
@@ -29,7 +31,7 @@ class find_one_and_update;
 namespace mongocxx {
 namespace options {
 
-using ::mongocxx::v_noabi::options::find_one_and_update;
+using v_noabi::options::find_one_and_update;
 
 } // namespace options
 } // namespace mongocxx
@@ -40,3 +42,6 @@ using ::mongocxx::v_noabi::options::find_one_and_update;
 /// @file
 /// Declares @ref mongocxx::v_noabi::options::find_one_and_update.
 ///
+/// @par Includes
+/// - @ref mongocxx/v1/find_one_and_update_options-fwd.hpp
+///