v1: find_options (CXX-3237, CXX-3238) (#1532)

* CXX-3236 Fix type of "comment" field

Author: eramongodb

src/mongocxx/include/mongocxx/v1/find_options.hpp

@@ -22,19 +22,19 @@
 
 #include <bsoncxx/v1/document/value-fwd.hpp>
 #include <bsoncxx/v1/document/view-fwd.hpp>
+#include <bsoncxx/v1/types/value-fwd.hpp>
+#include <bsoncxx/v1/types/view-fwd.hpp>
 
 #include <mongocxx/v1/hint-fwd.hpp>
 #include <mongocxx/v1/read_preference-fwd.hpp>
 
 #include <bsoncxx/v1/stdx/optional.hpp>
-#include <bsoncxx/v1/stdx/string_view.hpp>
 
 #include <mongocxx/v1/config/export.hpp>
 #include <mongocxx/v1/cursor.hpp>
 
 #include <chrono>
 #include <cstdint>
-#include <string>
 
 namespace mongocxx {
 namespace v1 {
@@ -159,12 +159,12 @@ class find_options {
     ///
     /// Set the "comment" field.
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(find_options&) comment(std::string comment);
+    MONGOCXX_ABI_EXPORT_CDECL(find_options&) comment(bsoncxx::v1::types::value comment);
 
     ///
     /// Return the current "comment" field.
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v1::stdx::optional<bsoncxx::v1::stdx::string_view>) comment() const;
+    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v1::stdx::optional<bsoncxx::v1::types::view>) comment() const;
 
     ///
     /// Set the "cursorType" field.
@@ -315,6 +315,8 @@ class find_options {
     /// Return the current "sort" field.
     ///
     MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v1::stdx::optional<bsoncxx::v1::document::view>) sort() const;
+
+    class internal;
 };
 
 } // namespace v1

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

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