Address StringMaker<T>::convert() implicit instantiation issues (#1525)

Author: eramongodb

src/mongocxx/test/subprocess.hh

@@ -14,8 +14,6 @@
 
 #pragma once
 
-#include <bsoncxx/v1/stdx/string_view.hpp>
-
 #include <functional>
 
 namespace mongocxx {

src/mongocxx/test/v1/count_options.cpp

@@ -16,17 +16,17 @@
 
 //
 
-#include <bsoncxx/v1/types/value.hpp>
-
 #include <mongocxx/v1/hint.hpp>
 #include <mongocxx/v1/read_preference.hpp>
 
+#include <bsoncxx/test/v1/types/value.hh>
+
+#include <mongocxx/test/private/scoped_bson.hh>
+
 #include <chrono>
 #include <cstdint>
 #include <utility>
 
-#include <mongocxx/private/scoped_bson.hh>
-
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 

src/mongocxx/test/v1/distinct_options.cpp

@@ -16,14 +16,13 @@
 
 //
 
-#include <bsoncxx/v1/document/view.hpp>
-#include <bsoncxx/v1/types/value.hpp>
-
 #include <mongocxx/v1/read_preference.hpp>
 
-#include <chrono>
+#include <bsoncxx/test/v1/types/value.hh>
 
-#include <mongocxx/private/scoped_bson.hh>
+#include <mongocxx/test/private/scoped_bson.hh>
+
+#include <chrono>
 
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>

src/mongocxx/test/v1/estimated_document_count_options.cpp

@@ -16,16 +16,16 @@
 
 //
 
-#include <bsoncxx/v1/types/value.hpp>
-
 #include <mongocxx/v1/read_preference.hpp>
 
+#include <bsoncxx/test/v1/types/value.hh>
+
+#include <mongocxx/test/private/scoped_bson.hh>
+
 #include <chrono>
 #include <cstdint>
 #include <utility>
 
-#include <mongocxx/private/scoped_bson.hh>
-
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 #include <catch2/generators/catch_generators_adapters.hpp>

src/mongocxx/test/v1/hint.cpp

@@ -18,11 +18,11 @@
 
 #include <bsoncxx/test/v1/types/view.hh>
 
+#include <mongocxx/test/private/scoped_bson.hh>
+
 #include <string>
 #include <utility>
 
-#include <mongocxx/private/scoped_bson.hh>
-
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 

src/mongocxx/test/v1/instance.cpp

@@ -16,7 +16,7 @@
 
 //
 
-#include <bsoncxx/v1/stdx/string_view.hpp>
+#include <bsoncxx/test/v1/stdx/string_view.hh>
 
 #include <mongocxx/test/v1/logger.hh>
 

src/mongocxx/test/v1/logger.cpp

@@ -16,7 +16,7 @@
 
 //
 
-#include <bsoncxx/v1/stdx/string_view.hpp>
+#include <bsoncxx/test/v1/stdx/string_view.hh>
 
 #include <type_traits>
 

src/mongocxx/test/v1/rewrap_many_datakey_options.cpp

@@ -18,11 +18,11 @@
 
 #include <bsoncxx/test/v1/stdx/string_view.hh>
 
+#include <mongocxx/test/private/scoped_bson.hh>
+
 #include <string>
 #include <utility>
 
-#include <mongocxx/private/scoped_bson.hh>
-
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 #include <catch2/generators/catch_generators_adapters.hpp>