v1: return_document (CXX-3237, CXX-3238) (#1506)

Author: eramongodb

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

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

src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp

@@ -16,30 +16,14 @@
 
 #include <mongocxx/options/find_one_common_options-fwd.hpp> // IWYU pragma: export
 
-#include <mongocxx/config/prelude.hpp>
-
-namespace mongocxx {
-namespace v_noabi {
-namespace options {
-
-///
-/// Indicates whether a `findOneAndModify` operation should return the old or new version of the
-/// modified document.
-///
-enum class return_document {
-    /// Return the version of the document before the modification takes place.
-    k_before,
-    /// Return the version of the document after the modification takes place.
-    k_after,
-};
-
-} // namespace options
-} // namespace v_noabi
-} // namespace mongocxx
+//
 
-#include <mongocxx/config/postlude.hpp>
+#include <mongocxx/v1/return_document.hpp> // IWYU pragma: export
 
 ///
 /// @file
 /// Provides @ref mongocxx::v_noabi::options::return_document.
 ///
+/// @par Includes
+/// - @ref mongocxx/v1/return_document.hpp
+///