From c68049ae107351c46f0fb35cd0ed5779da162eb6 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 16 Jan 2025 10:19:20 -0600 Subject: [PATCH 01/22] format: group private headers separately from public headers --- .clang-format | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.clang-format b/.clang-format index f6721e7926..ba498c4985 100644 --- a/.clang-format +++ b/.clang-format @@ -161,8 +161,12 @@ IncludeCategories: - Regex: 'mongocxx/v1/.*\.hh' # v1 private headers Priority: 27 - Regex: 'bsoncxx/config(/private)?/prelude\.(hpp|hh)' # v_noabi preludes - Priority: 60 + Priority: 62 - Regex: 'mongocxx/config(/private)?/prelude\.(hpp|hh)' # v_noabi preludes + Priority: 63 + - Regex: 'bsoncxx/private/.*' # private headers + Priority: 60 + - Regex: 'mongocxx/private/.*' # private headers Priority: 61 - Regex: 'bsoncxx/test/.*' # test headers Priority: 70 From 83acc8f5b40e1cefdf044fea6a7c4407e70efafa Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 16 Jan 2025 10:19:20 -0600 Subject: [PATCH 02/22] Relocate internal components out of v_noabi subdirectories --- src/bsoncxx/lib/CMakeLists.txt | 33 ++++---- .../{v_noabi/bsoncxx => }/private/b64_ntop.hh | 0 .../private => private/config}/config.hh.in | 0 .../private => private/config}/postlude.hh | 0 .../private => private/config}/prelude.hh | 2 +- .../{v_noabi/bsoncxx => }/private/helpers.hh | 6 +- .../{v_noabi/bsoncxx => }/private/itoa.cpp | 3 +- .../{v_noabi/bsoncxx => }/private/itoa.hh | 4 +- .../{v_noabi/bsoncxx => }/private/libbson.hh | 0 .../bsoncxx => }/private/make_unique.hh | 0 .../{v_noabi/bsoncxx => }/private/stack.hh | 4 +- .../private/suppress_deprecation_warnings.hh | 0 .../test_util/export_for_testing.hh | 4 +- .../bsoncxx/v_noabi/bsoncxx/array/element.cpp | 2 +- .../bsoncxx/v_noabi/bsoncxx/array/value.cpp | 2 +- .../bsoncxx/v_noabi/bsoncxx/array/view.cpp | 6 +- .../bsoncxx/v_noabi/bsoncxx/builder/core.cpp | 12 +-- .../bsoncxx/v_noabi/bsoncxx/decimal128.cpp | 4 +- .../v_noabi/bsoncxx/document/element.cpp | 6 +- .../v_noabi/bsoncxx/document/value.cpp | 2 +- .../bsoncxx/v_noabi/bsoncxx/document/view.cpp | 4 +- .../v_noabi/bsoncxx/exception/error_code.cpp | 2 +- .../lib/bsoncxx/v_noabi/bsoncxx/json.cpp | 6 +- .../lib/bsoncxx/v_noabi/bsoncxx/oid.cpp | 4 +- .../v_noabi/bsoncxx/string/view_or_value.cpp | 2 +- .../lib/bsoncxx/v_noabi/bsoncxx/types.cpp | 2 +- .../bsoncxx/types/bson_value/private/value.hh | 6 +- .../bsoncxx/types/bson_value/value.cpp | 4 +- .../v_noabi/bsoncxx/types/bson_value/view.cpp | 6 +- .../v_noabi/bsoncxx/types/private/convert.hh | 8 +- .../lib/bsoncxx/v_noabi/bsoncxx/validate.cpp | 6 +- src/bsoncxx/test/bson_builder.cpp | 3 +- src/bsoncxx/test/catch.hh | 4 +- src/bsoncxx/test/exception_guard.hh | 4 +- src/bsoncxx/test/json.cpp | 1 + src/bsoncxx/test/oid.cpp | 1 + src/bsoncxx/test/optional.test.cpp | 3 +- src/bsoncxx/test/to_string.hh | 4 +- src/mongocxx/lib/CMakeLists.txt | 75 ++++++++++--------- .../private/append_aggregate_options.hh | 4 +- .../mongocxx => }/private/bulk_write.hh | 6 +- .../mongocxx => }/private/change_stream.hh | 6 +- .../{v_noabi/mongocxx => }/private/client.hh | 6 +- .../private/client_encryption.hh | 13 ++-- .../mongocxx => }/private/client_session.hh | 12 +-- .../mongocxx => }/private/collection.hh | 9 ++- .../private => private/config}/config.hh.in | 0 .../private => private/config}/postlude.hh | 0 .../private => private/config}/prelude.hh | 2 +- .../mongocxx => }/private/conversions.cpp | 3 +- .../mongocxx => }/private/conversions.hh | 6 +- .../{v_noabi/mongocxx => }/private/cursor.hh | 6 +- .../mongocxx => }/private/database.hh | 6 +- .../mongocxx => }/private/index_view.hh | 6 +- .../mongocxx => }/private/libbson.cpp | 3 +- .../{v_noabi/mongocxx => }/private/libbson.hh | 7 +- .../mongocxx => }/private/libmongoc.cpp | 2 +- .../mongocxx => }/private/libmongoc.hh | 4 +- .../private/libmongoc_symbols.hh | 0 .../mongocxx => }/private/numeric_casting.cpp | 3 +- .../mongocxx => }/private/numeric_casting.hh | 4 +- .../mongocxx => }/private/pipeline.hh | 4 +- .../{v_noabi/mongocxx => }/private/pool.hh | 6 +- .../mongocxx => }/private/read_concern.hh | 6 +- .../mongocxx => }/private/read_preference.hh | 6 +- .../private/scoped_bson_value.hh | 0 .../private/search_index_model.hh | 4 +- .../private/search_index_view.hh | 8 +- .../{v_noabi/mongocxx => }/private/uri.hh | 6 +- .../mongocxx => }/private/write_concern.hh | 6 +- .../test_util/export_for_testing.hh | 6 +- .../{v_noabi/mongocxx => }/test_util/mock.hh | 4 +- .../mongocxx/v_noabi/mongocxx/bulk_write.cpp | 7 +- .../v_noabi/mongocxx/change_stream.cpp | 6 +- .../lib/mongocxx/v_noabi/mongocxx/client.cpp | 7 +- .../v_noabi/mongocxx/client_encryption.cpp | 6 +- .../v_noabi/mongocxx/client_session.cpp | 8 +- .../mongocxx/v_noabi/mongocxx/collection.cpp | 23 +++--- .../lib/mongocxx/v_noabi/mongocxx/cursor.cpp | 10 +-- .../mongocxx/v_noabi/mongocxx/database.cpp | 7 +- .../mongocxx/events/command_failed_event.cpp | 9 ++- .../mongocxx/events/command_started_event.cpp | 6 +- .../events/command_succeeded_event.cpp | 6 +- .../events/heartbeat_failed_event.cpp | 4 +- .../events/heartbeat_started_event.cpp | 4 +- .../events/heartbeat_succeeded_event.cpp | 4 +- .../mongocxx/events/server_changed_event.cpp | 4 +- .../mongocxx/events/server_closed_event.cpp | 4 +- .../mongocxx/events/server_description.cpp | 4 +- .../mongocxx/events/server_opening_event.cpp | 4 +- .../events/topology_changed_event.cpp | 4 +- .../mongocxx/events/topology_closed_event.cpp | 4 +- .../mongocxx/events/topology_description.cpp | 4 +- .../events/topology_opening_event.cpp | 4 +- .../v_noabi/mongocxx/exception/error_code.cpp | 2 +- .../exception/operation_exception.cpp | 4 +- .../exception/private/mongoc_error.hh | 6 +- .../mongocxx/exception/server_error_code.cpp | 2 +- .../v_noabi/mongocxx/gridfs/bucket.cpp | 7 +- .../v_noabi/mongocxx/gridfs/downloader.cpp | 7 +- .../v_noabi/mongocxx/gridfs/private/bucket.hh | 4 +- .../mongocxx/gridfs/private/downloader.hh | 4 +- .../mongocxx/gridfs/private/uploader.hh | 7 +- .../v_noabi/mongocxx/gridfs/uploader.cpp | 2 +- .../lib/mongocxx/v_noabi/mongocxx/hint.cpp | 2 +- .../mongocxx/v_noabi/mongocxx/index_model.cpp | 2 +- .../mongocxx/v_noabi/mongocxx/index_view.cpp | 7 +- .../mongocxx/v_noabi/mongocxx/instance.cpp | 8 +- .../lib/mongocxx/v_noabi/mongocxx/logger.cpp | 2 +- .../v_noabi/mongocxx/model/delete_many.cpp | 2 +- .../v_noabi/mongocxx/model/delete_one.cpp | 2 +- .../v_noabi/mongocxx/model/insert_one.cpp | 2 +- .../v_noabi/mongocxx/model/replace_one.cpp | 2 +- .../v_noabi/mongocxx/model/update_many.cpp | 2 +- .../v_noabi/mongocxx/model/update_one.cpp | 2 +- .../mongocxx/v_noabi/mongocxx/model/write.cpp | 2 +- .../v_noabi/mongocxx/options/aggregate.cpp | 4 +- .../mongocxx/v_noabi/mongocxx/options/apm.cpp | 2 +- .../mongocxx/options/auto_encryption.cpp | 4 +- .../v_noabi/mongocxx/options/bulk_write.cpp | 2 +- .../mongocxx/options/change_stream.cpp | 2 +- .../v_noabi/mongocxx/options/client.cpp | 2 +- .../mongocxx/options/client_encryption.cpp | 4 +- .../mongocxx/options/client_session.cpp | 2 +- .../v_noabi/mongocxx/options/count.cpp | 4 +- .../v_noabi/mongocxx/options/data_key.cpp | 1 + .../v_noabi/mongocxx/options/delete.cpp | 2 +- .../v_noabi/mongocxx/options/distinct.cpp | 4 +- .../v_noabi/mongocxx/options/encrypt.cpp | 4 +- .../options/estimated_document_count.cpp | 4 +- .../v_noabi/mongocxx/options/find.cpp | 4 +- .../mongocxx/options/find_one_and_delete.cpp | 2 +- .../mongocxx/options/find_one_and_replace.cpp | 2 +- .../mongocxx/options/find_one_and_update.cpp | 2 +- .../mongocxx/options/gridfs/bucket.cpp | 2 +- .../mongocxx/options/gridfs/upload.cpp | 2 +- .../v_noabi/mongocxx/options/index.cpp | 7 +- .../v_noabi/mongocxx/options/index_view.cpp | 2 +- .../v_noabi/mongocxx/options/insert.cpp | 2 +- .../v_noabi/mongocxx/options/pool.cpp | 2 +- .../v_noabi/mongocxx/options/private/apm.hh | 6 +- .../mongocxx/options/private/server_api.hh | 6 +- .../v_noabi/mongocxx/options/private/ssl.hh | 6 +- .../mongocxx/options/private/transaction.hh | 5 +- .../v_noabi/mongocxx/options/replace.cpp | 2 +- .../mongocxx/options/rewrap_many_datakey.cpp | 4 +- .../v_noabi/mongocxx/options/server_api.cpp | 4 +- .../mongocxx/v_noabi/mongocxx/options/tls.cpp | 2 +- .../v_noabi/mongocxx/options/transaction.cpp | 8 +- .../v_noabi/mongocxx/options/update.cpp | 2 +- .../mongocxx/v_noabi/mongocxx/pipeline.cpp | 7 +- .../lib/mongocxx/v_noabi/mongocxx/pool.cpp | 8 +- .../v_noabi/mongocxx/read_concern.cpp | 9 ++- .../v_noabi/mongocxx/read_preference.cpp | 9 ++- .../v_noabi/mongocxx/result/bulk_write.cpp | 2 +- .../v_noabi/mongocxx/result/delete.cpp | 2 +- .../v_noabi/mongocxx/result/gridfs/upload.cpp | 2 +- .../v_noabi/mongocxx/result/insert_many.cpp | 2 +- .../v_noabi/mongocxx/result/insert_one.cpp | 2 +- .../v_noabi/mongocxx/result/replace_one.cpp | 2 +- .../mongocxx/result/rewrap_many_datakey.cpp | 4 +- .../v_noabi/mongocxx/result/update.cpp | 2 +- .../v_noabi/mongocxx/search_index_model.cpp | 8 +- .../v_noabi/mongocxx/search_index_view.cpp | 8 +- .../lib/mongocxx/v_noabi/mongocxx/uri.cpp | 9 ++- .../v_noabi/mongocxx/validation_criteria.cpp | 2 +- .../v_noabi/mongocxx/write_concern.cpp | 9 ++- src/mongocxx/test/bulk_write.cpp | 3 +- src/mongocxx/test/catch_helpers.hh | 6 +- src/mongocxx/test/change_streams.cpp | 6 +- src/mongocxx/test/client.cpp | 6 +- src/mongocxx/test/client_helpers.cpp | 4 +- src/mongocxx/test/client_helpers.hh | 6 +- src/mongocxx/test/client_session.cpp | 7 +- src/mongocxx/test/client_side_encryption.cpp | 6 +- src/mongocxx/test/collection.cpp | 8 +- src/mongocxx/test/collection_mocked.cpp | 8 +- src/mongocxx/test/conversions.cpp | 3 +- src/mongocxx/test/database.cpp | 1 + src/mongocxx/test/logging.cpp | 5 +- src/mongocxx/test/options/index.cpp | 3 +- src/mongocxx/test/pool.cpp | 4 +- src/mongocxx/test/private/write_concern.cpp | 3 +- src/mongocxx/test/read_preference.cpp | 3 +- src/mongocxx/test/spec/gridfs.cpp | 3 +- src/mongocxx/test/spec/monitoring.cpp | 4 +- src/mongocxx/test/spec/monitoring.hh | 4 +- src/mongocxx/test/spec/operation.cpp | 4 +- src/mongocxx/test/spec/operation.hh | 6 +- .../test/spec/unified_tests/assert.hh | 4 +- .../test/spec/unified_tests/entity.hh | 4 +- .../test/spec/unified_tests/operations.hh | 4 +- src/mongocxx/test/spec/util.cpp | 4 +- src/mongocxx/test/spec/util.hh | 4 +- 194 files changed, 493 insertions(+), 448 deletions(-) rename src/bsoncxx/lib/bsoncxx/{v_noabi/bsoncxx => }/private/b64_ntop.hh (100%) rename src/bsoncxx/lib/bsoncxx/{v_noabi/bsoncxx/config/private => private/config}/config.hh.in (100%) rename src/bsoncxx/lib/bsoncxx/{v_noabi/bsoncxx/config/private => private/config}/postlude.hh (100%) rename src/bsoncxx/lib/bsoncxx/{v_noabi/bsoncxx/config/private => private/config}/prelude.hh (94%) rename src/bsoncxx/lib/bsoncxx/{v_noabi/bsoncxx => }/private/helpers.hh (94%) rename src/bsoncxx/lib/bsoncxx/{v_noabi/bsoncxx => }/private/itoa.cpp (99%) rename src/bsoncxx/lib/bsoncxx/{v_noabi/bsoncxx => }/private/itoa.hh (93%) rename src/bsoncxx/lib/bsoncxx/{v_noabi/bsoncxx => }/private/libbson.hh (100%) rename src/bsoncxx/lib/bsoncxx/{v_noabi/bsoncxx => }/private/make_unique.hh (100%) rename src/bsoncxx/lib/bsoncxx/{v_noabi/bsoncxx => }/private/stack.hh (98%) rename src/bsoncxx/lib/bsoncxx/{v_noabi/bsoncxx => }/private/suppress_deprecation_warnings.hh (100%) rename src/bsoncxx/lib/bsoncxx/{v_noabi/bsoncxx => }/test_util/export_for_testing.hh (92%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/append_aggregate_options.hh (94%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/bulk_write.hh (92%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/change_stream.hh (97%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/client.hh (93%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/client_encryption.hh (99%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/client_session.hh (98%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/collection.hh (95%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx/config/private => private/config}/config.hh.in (100%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx/config/private => private/config}/postlude.hh (100%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx/config/private => private/config}/prelude.hh (95%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/conversions.cpp (97%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/conversions.hh (92%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/cursor.hh (96%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/database.hh (94%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/index_view.hh (99%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/libbson.cpp (98%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/libbson.hh (98%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/libmongoc.cpp (96%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/libmongoc.hh (96%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/libmongoc_symbols.hh (100%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/numeric_casting.cpp (97%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/numeric_casting.hh (95%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/pipeline.hh (92%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/pool.hh (93%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/read_concern.hh (92%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/read_preference.hh (92%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/scoped_bson_value.hh (100%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/search_index_model.hh (88%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/search_index_view.hh (98%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/uri.hh (92%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/private/write_concern.hh (92%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/test_util/export_for_testing.hh (82%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx => }/test_util/mock.hh (98%) diff --git a/src/bsoncxx/lib/CMakeLists.txt b/src/bsoncxx/lib/CMakeLists.txt index 4103e8c825..c5a6930cae 100644 --- a/src/bsoncxx/lib/CMakeLists.txt +++ b/src/bsoncxx/lib/CMakeLists.txt @@ -12,6 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +set(bsoncxx_sources_private + bsoncxx/private/itoa.cpp +) + set(bsoncxx_sources_v_noabi bsoncxx/v_noabi/bsoncxx/array/element.cpp bsoncxx/v_noabi/bsoncxx/array/value.cpp @@ -28,7 +32,6 @@ set(bsoncxx_sources_v_noabi bsoncxx/v_noabi/bsoncxx/exception/exception.cpp bsoncxx/v_noabi/bsoncxx/json.cpp bsoncxx/v_noabi/bsoncxx/oid.cpp - bsoncxx/v_noabi/bsoncxx/private/itoa.cpp bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp bsoncxx/v_noabi/bsoncxx/types.cpp bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp @@ -45,6 +48,7 @@ set(bsoncxx_sources_v1 ) list(APPEND bsoncxx_sources + ${bsoncxx_sources_private} ${bsoncxx_sources_v_noabi} ${bsoncxx_sources_v1} ) @@ -54,8 +58,8 @@ set(bsoncxx_sources "${bsoncxx_sources}" PARENT_SCOPE) # Generate private headers. if(1) configure_file( - bsoncxx/v_noabi/bsoncxx/config/private/config.hh.in - bsoncxx/v_noabi/bsoncxx/config/private/config.hh + bsoncxx/private/config/config.hh.in + bsoncxx/private/config/config.hh ) endif() @@ -81,19 +85,20 @@ endif() set_dist_list(src_bsoncxx_lib_DIST CMakeLists.txt + ${bsoncxx_sources_private} ${bsoncxx_sources_v_noabi} ${bsoncxx_sources_v1} - bsoncxx/v_noabi/bsoncxx/config/private/config.hh.in - bsoncxx/v_noabi/bsoncxx/config/private/postlude.hh - bsoncxx/v_noabi/bsoncxx/config/private/prelude.hh - bsoncxx/v_noabi/bsoncxx/private/b64_ntop.hh - bsoncxx/v_noabi/bsoncxx/private/helpers.hh - bsoncxx/v_noabi/bsoncxx/private/make_unique.hh - bsoncxx/v_noabi/bsoncxx/private/itoa.hh - bsoncxx/v_noabi/bsoncxx/private/libbson.hh - bsoncxx/v_noabi/bsoncxx/private/stack.hh - bsoncxx/v_noabi/bsoncxx/private/suppress_deprecation_warnings.hh - bsoncxx/v_noabi/bsoncxx/test_util/export_for_testing.hh + bsoncxx/private/b64_ntop.hh + bsoncxx/private/config/config.hh.in + bsoncxx/private/config/postlude.hh + bsoncxx/private/config/prelude.hh + bsoncxx/private/helpers.hh + bsoncxx/private/itoa.hh + bsoncxx/private/libbson.hh + bsoncxx/private/make_unique.hh + bsoncxx/private/stack.hh + bsoncxx/private/suppress_deprecation_warnings.hh + bsoncxx/test_util/export_for_testing.hh bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh bsoncxx/v_noabi/bsoncxx/types/private/convert.hh bsoncxx/v1/config/config.hpp.in diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/b64_ntop.hh b/src/bsoncxx/lib/bsoncxx/private/b64_ntop.hh similarity index 100% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/b64_ntop.hh rename to src/bsoncxx/lib/bsoncxx/private/b64_ntop.hh diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/config.hh.in b/src/bsoncxx/lib/bsoncxx/private/config/config.hh.in similarity index 100% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/config.hh.in rename to src/bsoncxx/lib/bsoncxx/private/config/config.hh.in diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/postlude.hh b/src/bsoncxx/lib/bsoncxx/private/config/postlude.hh similarity index 100% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/postlude.hh rename to src/bsoncxx/lib/bsoncxx/private/config/postlude.hh diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/prelude.hh b/src/bsoncxx/lib/bsoncxx/private/config/prelude.hh similarity index 94% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/prelude.hh rename to src/bsoncxx/lib/bsoncxx/private/config/prelude.hh index 2121524065..bae02463d1 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/prelude.hh +++ b/src/bsoncxx/lib/bsoncxx/private/config/prelude.hh @@ -17,4 +17,4 @@ // NOTE: Push any macros here that are defined by the following // headers here. -#include +#include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/helpers.hh b/src/bsoncxx/lib/bsoncxx/private/helpers.hh similarity index 94% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/helpers.hh rename to src/bsoncxx/lib/bsoncxx/private/helpers.hh index 32d887d303..1c78c95f37 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/helpers.hh +++ b/src/bsoncxx/lib/bsoncxx/private/helpers.hh @@ -17,9 +17,9 @@ #include #include #include -#include -#include +#include +#include namespace bsoncxx { namespace helpers { @@ -48,4 +48,4 @@ inline bsoncxx::v_noabi::oid make_oid(bson_oid_t const* bson_oid) { } // namespace helpers } // namespace bsoncxx -#include +#include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.cpp b/src/bsoncxx/lib/bsoncxx/private/itoa.cpp similarity index 99% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.cpp rename to src/bsoncxx/lib/bsoncxx/private/itoa.cpp index 85c540854b..e9e446850b 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.cpp +++ b/src/bsoncxx/lib/bsoncxx/private/itoa.cpp @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include -#include - namespace bsoncxx { namespace { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.hh b/src/bsoncxx/lib/bsoncxx/private/itoa.hh similarity index 93% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.hh rename to src/bsoncxx/lib/bsoncxx/private/itoa.hh index af23dea484..43fc24d67d 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.hh +++ b/src/bsoncxx/lib/bsoncxx/private/itoa.hh @@ -19,7 +19,7 @@ #include -#include +#include namespace bsoncxx { @@ -60,4 +60,4 @@ class itoa { } // namespace bsoncxx -#include +#include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/libbson.hh b/src/bsoncxx/lib/bsoncxx/private/libbson.hh similarity index 100% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/libbson.hh rename to src/bsoncxx/lib/bsoncxx/private/libbson.hh diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/make_unique.hh b/src/bsoncxx/lib/bsoncxx/private/make_unique.hh similarity index 100% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/make_unique.hh rename to src/bsoncxx/lib/bsoncxx/private/make_unique.hh diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/stack.hh b/src/bsoncxx/lib/bsoncxx/private/stack.hh similarity index 98% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/stack.hh rename to src/bsoncxx/lib/bsoncxx/private/stack.hh index 173edaf6d2..b261e19b8d 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/stack.hh +++ b/src/bsoncxx/lib/bsoncxx/private/stack.hh @@ -18,7 +18,7 @@ #include #include -#include +#include namespace bsoncxx { @@ -162,4 +162,4 @@ class stack { } // namespace bsoncxx -#include +#include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/suppress_deprecation_warnings.hh b/src/bsoncxx/lib/bsoncxx/private/suppress_deprecation_warnings.hh similarity index 100% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/suppress_deprecation_warnings.hh rename to src/bsoncxx/lib/bsoncxx/private/suppress_deprecation_warnings.hh diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/test_util/export_for_testing.hh b/src/bsoncxx/lib/bsoncxx/test_util/export_for_testing.hh similarity index 92% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/test_util/export_for_testing.hh rename to src/bsoncxx/lib/bsoncxx/test_util/export_for_testing.hh index daeda50ae9..bd75d3e024 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/test_util/export_for_testing.hh +++ b/src/bsoncxx/lib/bsoncxx/test_util/export_for_testing.hh @@ -14,7 +14,7 @@ #pragma once -#include +#include // The BSONCXX_TESTING macro is intended to be used for exporting symbols for testing which are not // normally exported as part of the bsoncxx library. We currently use this workaround in lieu of @@ -29,4 +29,4 @@ #define BSONCXX_ABI_EXPORT_CDECL_TESTING(...) __VA_ARGS__ #endif -#include +#include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp index 84e200c8b9..4a071bc3da 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp index 59a1fd65f1..57f20ecaf5 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp index fc31a76c7e..5dac785ea9 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp @@ -16,12 +16,12 @@ #include #include -#include -#include #include #include -#include +#include +#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp index 7cc4931c59..9855070530 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp @@ -17,17 +17,17 @@ #include #include #include -#include -#include -#include -#include -#include #include #include #include #include -#include +#include +#include +#include +#include +#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp index a710ccc280..870a64a64f 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp @@ -15,11 +15,11 @@ #include #include #include -#include #include #include -#include +#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp index bc497e2919..6122248cdb 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp @@ -18,13 +18,13 @@ #include #include #include -#include -#include #include #include #include -#include +#include +#include +#include #define BSONCXX_CITER \ bson_iter_t iter; \ diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp index b5b636b8c5..d8873b1853 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp index 8ae1b190a2..f94d8ff11b 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp @@ -16,10 +16,10 @@ #include #include -#include #include -#include +#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp index 62943a0a9e..4d7904bda3 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp index 8393de1bac..b67324ce5e 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp @@ -19,13 +19,13 @@ #include #include #include -#include -#include #include #include #include -#include +#include +#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp index cf14c3ee2c..64f6ab35ee 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp @@ -17,9 +17,9 @@ #include #include #include -#include -#include +#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp index d01972dafa..cc4a6e3034 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp index 76e8ae0348..54b3b6b501 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh index 0c7d34d6ab..0c4ce27848 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh @@ -14,11 +14,11 @@ #pragma once -#include #include #include -#include +#include +#include namespace bsoncxx { namespace v_noabi { @@ -65,4 +65,4 @@ inline bson_value::value make_owning_bson(void* internal_value) { } // namespace v_noabi } // namespace bsoncxx -#include +#include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp index c673065068..71aec0ff2d 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp @@ -14,12 +14,12 @@ #include #include -#include #include #include #include -#include +#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp index 27ae875239..0b233d65fc 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp @@ -16,12 +16,12 @@ #include #include -#include -#include #include #include -#include +#include +#include +#include #define BSONCXX_CITER \ bson_iter_t iter; \ diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh index 8d8b38a96a..c77be8a8c1 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh @@ -16,12 +16,12 @@ #include -#include -#include #include #include -#include +#include +#include +#include namespace bsoncxx { namespace v_noabi { @@ -327,4 +327,4 @@ inline void convert_from_libbson(bson_value_t const* v, b_array* out) { } // namespace v_noabi } // namespace bsoncxx -#include +#include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp index 51a38f768d..640c416ae1 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include #include -#include +#include +#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/test/bson_builder.cpp b/src/bsoncxx/test/bson_builder.cpp index cd4188ac32..0e6d757331 100644 --- a/src/bsoncxx/test/bson_builder.cpp +++ b/src/bsoncxx/test/bson_builder.cpp @@ -22,11 +22,12 @@ #include #include #include -#include #include #include #include +#include + #include #include diff --git a/src/bsoncxx/test/catch.hh b/src/bsoncxx/test/catch.hh index aef7695024..2ebd064c63 100644 --- a/src/bsoncxx/test/catch.hh +++ b/src/bsoncxx/test/catch.hh @@ -20,7 +20,7 @@ #include #include -#include +#include #include @@ -149,4 +149,4 @@ struct StringMaker { } // namespace Catch -#include +#include diff --git a/src/bsoncxx/test/exception_guard.hh b/src/bsoncxx/test/exception_guard.hh index 3fdfa14f80..f922413c73 100644 --- a/src/bsoncxx/test/exception_guard.hh +++ b/src/bsoncxx/test/exception_guard.hh @@ -23,7 +23,7 @@ #include -#include +#include #include @@ -102,4 +102,4 @@ struct exception_guard_state { } // namespace test } // namespace bsoncxx -#include +#include diff --git a/src/bsoncxx/test/json.cpp b/src/bsoncxx/test/json.cpp index e42b3e1762..220b9b32a4 100644 --- a/src/bsoncxx/test/json.cpp +++ b/src/bsoncxx/test/json.cpp @@ -18,6 +18,7 @@ #include #include #include + #include #include diff --git a/src/bsoncxx/test/oid.cpp b/src/bsoncxx/test/oid.cpp index 6ad9d79a62..ccec00437f 100644 --- a/src/bsoncxx/test/oid.cpp +++ b/src/bsoncxx/test/oid.cpp @@ -20,6 +20,7 @@ #include #include + #include #include diff --git a/src/bsoncxx/test/optional.test.cpp b/src/bsoncxx/test/optional.test.cpp index 627b316a25..a70d89305d 100644 --- a/src/bsoncxx/test/optional.test.cpp +++ b/src/bsoncxx/test/optional.test.cpp @@ -6,11 +6,12 @@ #include #include -#include #include #include #include +#include + #include #include diff --git a/src/bsoncxx/test/to_string.hh b/src/bsoncxx/test/to_string.hh index 18da14f8ff..eb600ce7d3 100644 --- a/src/bsoncxx/test/to_string.hh +++ b/src/bsoncxx/test/to_string.hh @@ -26,7 +26,7 @@ #include #include -#include +#include namespace bsoncxx { @@ -93,4 +93,4 @@ inline std::string to_string(bsoncxx::v_noabi::types::bson_value::view_or_value } // namespace bsoncxx -#include +#include diff --git a/src/mongocxx/lib/CMakeLists.txt b/src/mongocxx/lib/CMakeLists.txt index 0a4fb40d9e..180404c031 100644 --- a/src/mongocxx/lib/CMakeLists.txt +++ b/src/mongocxx/lib/CMakeLists.txt @@ -12,6 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +set(mongocxx_sources_private + mongocxx/private/conversions.cpp + mongocxx/private/libbson.cpp + mongocxx/private/libmongoc.cpp + mongocxx/private/numeric_casting.cpp +) + set(mongocxx_sources_v_noabi mongocxx/v_noabi/mongocxx/bulk_write.cpp mongocxx/v_noabi/mongocxx/change_stream.cpp @@ -96,10 +103,6 @@ set(mongocxx_sources_v_noabi mongocxx/v_noabi/mongocxx/options/update.cpp mongocxx/v_noabi/mongocxx/pipeline.cpp mongocxx/v_noabi/mongocxx/pool.cpp - mongocxx/v_noabi/mongocxx/private/conversions.cpp - mongocxx/v_noabi/mongocxx/private/libbson.cpp - mongocxx/v_noabi/mongocxx/private/libmongoc.cpp - mongocxx/v_noabi/mongocxx/private/numeric_casting.cpp mongocxx/v_noabi/mongocxx/read_concern.cpp mongocxx/v_noabi/mongocxx/read_preference.cpp mongocxx/v_noabi/mongocxx/result/bulk_write.cpp @@ -126,6 +129,7 @@ set(mongocxx_sources_v1 ) list(APPEND mongocxx_sources + ${mongocxx_sources_private} ${mongocxx_sources_v_noabi} ${mongocxx_sources_v1} ) @@ -147,8 +151,8 @@ if(1) endif() configure_file( - mongocxx/v_noabi/mongocxx/config/private/config.hh.in - mongocxx/v_noabi/mongocxx/config/private/config.hh + mongocxx/private/config/config.hh.in + mongocxx/private/config/config.hh ) endif() @@ -174,11 +178,38 @@ endif() set_dist_list(src_mongocxx_lib_DIST CMakeLists.txt + ${mongocxx_sources_private} ${mongocxx_sources_v_noabi} ${mongocxx_sources_v1} - mongocxx/v_noabi/mongocxx/config/private/config.hh.in - mongocxx/v_noabi/mongocxx/config/private/postlude.hh - mongocxx/v_noabi/mongocxx/config/private/prelude.hh + mongocxx/private/append_aggregate_options.hh + mongocxx/private/bulk_write.hh + mongocxx/private/change_stream.hh + mongocxx/private/client_encryption.hh + mongocxx/private/client_session.hh + mongocxx/private/client.hh + mongocxx/private/collection.hh + mongocxx/private/config/config.hh.in + mongocxx/private/config/postlude.hh + mongocxx/private/config/prelude.hh + mongocxx/private/conversions.hh + mongocxx/private/cursor.hh + mongocxx/private/database.hh + mongocxx/private/index_view.hh + mongocxx/private/libbson.hh + mongocxx/private/libmongoc_symbols.hh + mongocxx/private/libmongoc.hh + mongocxx/private/numeric_casting.hh + mongocxx/private/pipeline.hh + mongocxx/private/pool.hh + mongocxx/private/read_concern.hh + mongocxx/private/read_preference.hh + mongocxx/private/scoped_bson_value.hh + mongocxx/private/search_index_model.hh + mongocxx/private/search_index_view.hh + mongocxx/private/uri.hh + mongocxx/private/write_concern.hh + mongocxx/test_util/export_for_testing.hh + mongocxx/test_util/mock.hh mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh @@ -187,32 +218,6 @@ set_dist_list(src_mongocxx_lib_DIST mongocxx/v_noabi/mongocxx/options/private/server_api.hh mongocxx/v_noabi/mongocxx/options/private/ssl.hh mongocxx/v_noabi/mongocxx/options/private/transaction.hh - mongocxx/v_noabi/mongocxx/private/append_aggregate_options.hh - mongocxx/v_noabi/mongocxx/private/bulk_write.hh - mongocxx/v_noabi/mongocxx/private/change_stream.hh - mongocxx/v_noabi/mongocxx/private/client_encryption.hh - mongocxx/v_noabi/mongocxx/private/client_session.hh - mongocxx/v_noabi/mongocxx/private/client.hh - mongocxx/v_noabi/mongocxx/private/collection.hh - mongocxx/v_noabi/mongocxx/private/conversions.hh - mongocxx/v_noabi/mongocxx/private/cursor.hh - mongocxx/v_noabi/mongocxx/private/database.hh - mongocxx/v_noabi/mongocxx/private/index_view.hh - mongocxx/v_noabi/mongocxx/private/libbson.hh - mongocxx/v_noabi/mongocxx/private/libmongoc_symbols.hh - mongocxx/v_noabi/mongocxx/private/libmongoc.hh - mongocxx/v_noabi/mongocxx/private/numeric_casting.hh - mongocxx/v_noabi/mongocxx/private/pipeline.hh - mongocxx/v_noabi/mongocxx/private/pool.hh - mongocxx/v_noabi/mongocxx/private/read_concern.hh - mongocxx/v_noabi/mongocxx/private/read_preference.hh - mongocxx/v_noabi/mongocxx/private/scoped_bson_value.hh - mongocxx/v_noabi/mongocxx/private/search_index_model.hh - mongocxx/v_noabi/mongocxx/private/search_index_view.hh - mongocxx/v_noabi/mongocxx/private/uri.hh - mongocxx/v_noabi/mongocxx/private/write_concern.hh - mongocxx/v_noabi/mongocxx/test_util/export_for_testing.hh - mongocxx/v_noabi/mongocxx/test_util/mock.hh mongocxx/v1/config/config.hpp.in mongocxx/v1/config/version.hpp.in ) diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/append_aggregate_options.hh b/src/mongocxx/lib/mongocxx/private/append_aggregate_options.hh similarity index 94% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/append_aggregate_options.hh rename to src/mongocxx/lib/mongocxx/private/append_aggregate_options.hh index 406382909c..a1dbb54108 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/append_aggregate_options.hh +++ b/src/mongocxx/lib/mongocxx/private/append_aggregate_options.hh @@ -4,7 +4,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { @@ -57,4 +57,4 @@ inline void append_aggregate_options( } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/bulk_write.hh b/src/mongocxx/lib/mongocxx/private/bulk_write.hh similarity index 92% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/bulk_write.hh rename to src/mongocxx/lib/mongocxx/private/bulk_write.hh index 0fce635f90..5a34fddaa8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/bulk_write.hh +++ b/src/mongocxx/lib/mongocxx/private/bulk_write.hh @@ -15,9 +15,9 @@ #pragma once #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { @@ -43,4 +43,4 @@ class bulk_write::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/change_stream.hh b/src/mongocxx/lib/mongocxx/private/change_stream.hh similarity index 97% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/change_stream.hh rename to src/mongocxx/lib/mongocxx/private/change_stream.hh index 2e82dd9929..68129fb268 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/change_stream.hh +++ b/src/mongocxx/lib/mongocxx/private/change_stream.hh @@ -20,11 +20,11 @@ #include #include #include + +#include #include #include -#include - namespace mongocxx { namespace v_noabi { @@ -123,4 +123,4 @@ class change_stream::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client.hh b/src/mongocxx/lib/mongocxx/private/client.hh similarity index 93% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client.hh rename to src/mongocxx/lib/mongocxx/private/client.hh index 3f6c23e478..b2c21eafee 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client.hh +++ b/src/mongocxx/lib/mongocxx/private/client.hh @@ -17,11 +17,11 @@ #include #include + +#include #include #include -#include - namespace mongocxx { namespace v_noabi { @@ -47,4 +47,4 @@ class client::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh b/src/mongocxx/lib/mongocxx/private/client_encryption.hh similarity index 99% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh rename to src/mongocxx/lib/mongocxx/private/client_encryption.hh index f1f50f22f9..d23f7e2d9a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh +++ b/src/mongocxx/lib/mongocxx/private/client_encryption.hh @@ -17,8 +17,6 @@ #include #include -#include -#include #include #include #include @@ -29,14 +27,17 @@ #include #include #include +#include + +#include +#include + #include +#include #include #include #include #include -#include - -#include namespace mongocxx { namespace v_noabi { @@ -364,4 +365,4 @@ class client_encryption::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_session.hh b/src/mongocxx/lib/mongocxx/private/client_session.hh similarity index 98% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_session.hh rename to src/mongocxx/lib/mongocxx/private/client_session.hh index b3e2803aa8..e374156f36 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_session.hh +++ b/src/mongocxx/lib/mongocxx/private/client_session.hh @@ -18,21 +18,21 @@ #include -#include -#include - #include #include #include #include #include #include + +#include +#include + #include +#include #include #include -#include - namespace mongocxx { namespace v_noabi { @@ -242,4 +242,4 @@ class client_session::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/collection.hh b/src/mongocxx/lib/mongocxx/private/collection.hh similarity index 95% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/collection.hh rename to src/mongocxx/lib/mongocxx/private/collection.hh index 3d9487eb5f..491df6aabe 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/collection.hh +++ b/src/mongocxx/lib/mongocxx/private/collection.hh @@ -15,18 +15,19 @@ #pragma once #include -#include #include #include #include + +#include + +#include #include #include #include #include -#include - namespace mongocxx { namespace v_noabi { @@ -67,4 +68,4 @@ class collection::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/config.hh.in b/src/mongocxx/lib/mongocxx/private/config/config.hh.in similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/config.hh.in rename to src/mongocxx/lib/mongocxx/private/config/config.hh.in diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/postlude.hh b/src/mongocxx/lib/mongocxx/private/config/postlude.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/postlude.hh rename to src/mongocxx/lib/mongocxx/private/config/postlude.hh diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/prelude.hh b/src/mongocxx/lib/mongocxx/private/config/prelude.hh similarity index 95% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/prelude.hh rename to src/mongocxx/lib/mongocxx/private/config/prelude.hh index d01e52a4fa..0cddf0e046 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/prelude.hh +++ b/src/mongocxx/lib/mongocxx/private/config/prelude.hh @@ -25,4 +25,4 @@ #pragma push_macro("MONGOCXX_COMPILER_VERSION") #undef MONGOCXX_COMPILER_VERSION -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.cpp b/src/mongocxx/lib/mongocxx/private/conversions.cpp similarity index 97% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.cpp rename to src/mongocxx/lib/mongocxx/private/conversions.cpp index 5090b6311d..b9da12f22c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.cpp +++ b/src/mongocxx/lib/mongocxx/private/conversions.cpp @@ -14,10 +14,9 @@ #include +#include #include -#include - namespace mongocxx { namespace libmongoc { namespace conversions { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.hh b/src/mongocxx/lib/mongocxx/private/conversions.hh similarity index 92% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.hh rename to src/mongocxx/lib/mongocxx/private/conversions.hh index b22508102a..028418b5c6 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.hh +++ b/src/mongocxx/lib/mongocxx/private/conversions.hh @@ -14,11 +14,11 @@ #pragma once -#include #include #include -#include +#include +#include namespace mongocxx { namespace libmongoc { @@ -34,4 +34,4 @@ read_mode_from_read_mode_t(mongoc_read_mode_t read_mode); } // namespace libmongoc } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/cursor.hh b/src/mongocxx/lib/mongocxx/private/cursor.hh similarity index 96% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/cursor.hh rename to src/mongocxx/lib/mongocxx/private/cursor.hh index f0e88fe2f7..26a36bba94 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/cursor.hh +++ b/src/mongocxx/lib/mongocxx/private/cursor.hh @@ -18,9 +18,9 @@ #include #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { @@ -92,4 +92,4 @@ class cursor::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/database.hh b/src/mongocxx/lib/mongocxx/private/database.hh similarity index 94% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/database.hh rename to src/mongocxx/lib/mongocxx/private/database.hh index 7b48416588..bc93d77589 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/database.hh +++ b/src/mongocxx/lib/mongocxx/private/database.hh @@ -16,12 +16,12 @@ #include #include + #include +#include #include #include -#include - namespace mongocxx { namespace v_noabi { @@ -56,4 +56,4 @@ class database::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/index_view.hh b/src/mongocxx/lib/mongocxx/private/index_view.hh similarity index 99% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/index_view.hh rename to src/mongocxx/lib/mongocxx/private/index_view.hh index df5e06137e..f8e98228ef 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/index_view.hh +++ b/src/mongocxx/lib/mongocxx/private/index_view.hh @@ -28,12 +28,12 @@ #include #include #include + #include +#include #include #include -#include - namespace mongocxx { namespace v_noabi { @@ -277,4 +277,4 @@ class index_view::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.cpp b/src/mongocxx/lib/mongocxx/private/libbson.cpp similarity index 98% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.cpp rename to src/mongocxx/lib/mongocxx/private/libbson.cpp index 2486223763..fd7a4eb85c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.cpp +++ b/src/mongocxx/lib/mongocxx/private/libbson.cpp @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include -#include - namespace mongocxx { namespace libbson { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.hh b/src/mongocxx/lib/mongocxx/private/libbson.hh similarity index 98% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.hh rename to src/mongocxx/lib/mongocxx/private/libbson.hh index 71ca614bf5..4117fe9bbc 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.hh +++ b/src/mongocxx/lib/mongocxx/private/libbson.hh @@ -17,12 +17,13 @@ #include #include #include -#include #include #include -#include +#include + +#include namespace mongocxx { namespace libbson { @@ -162,4 +163,4 @@ class scoped_bson_t { } // namespace libbson } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.cpp b/src/mongocxx/lib/mongocxx/private/libmongoc.cpp similarity index 96% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.cpp rename to src/mongocxx/lib/mongocxx/private/libmongoc.cpp index 2ecf27c816..b51fe2a324 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.cpp +++ b/src/mongocxx/lib/mongocxx/private/libmongoc.cpp @@ -14,7 +14,7 @@ #include "libmongoc.hh" -#include +#include namespace mongocxx { namespace libmongoc { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.hh b/src/mongocxx/lib/mongocxx/private/libmongoc.hh similarity index 96% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.hh rename to src/mongocxx/lib/mongocxx/private/libmongoc.hh index fc86e6083a..6be7c50709 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.hh +++ b/src/mongocxx/lib/mongocxx/private/libmongoc.hh @@ -37,7 +37,7 @@ #include #include -#include +#include namespace mongocxx { namespace libmongoc { @@ -84,4 +84,4 @@ constexpr auto log_set_handler = mongoc_log_set_handler; } // namespace libmongoc } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc_symbols.hh b/src/mongocxx/lib/mongocxx/private/libmongoc_symbols.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc_symbols.hh rename to src/mongocxx/lib/mongocxx/private/libmongoc_symbols.hh diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.cpp b/src/mongocxx/lib/mongocxx/private/numeric_casting.cpp similarity index 97% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.cpp rename to src/mongocxx/lib/mongocxx/private/numeric_casting.cpp index 7696d57fbc..fd35a45641 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.cpp +++ b/src/mongocxx/lib/mongocxx/private/numeric_casting.cpp @@ -14,10 +14,9 @@ #include +#include #include -#include - namespace mongocxx { bool size_t_to_int64_safe(std::size_t const in, int64_t& out) { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.hh b/src/mongocxx/lib/mongocxx/private/numeric_casting.hh similarity index 95% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.hh rename to src/mongocxx/lib/mongocxx/private/numeric_casting.hh index 6eb2b0c867..e8106f5136 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.hh +++ b/src/mongocxx/lib/mongocxx/private/numeric_casting.hh @@ -19,7 +19,7 @@ #include -#include +#include namespace mongocxx { @@ -45,4 +45,4 @@ MONGOCXX_ABI_EXPORT_CDECL_TESTING(bool) int64_to_size_t_safe(int64_t const in, s } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pipeline.hh b/src/mongocxx/lib/mongocxx/private/pipeline.hh similarity index 92% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pipeline.hh rename to src/mongocxx/lib/mongocxx/private/pipeline.hh index 1a9f4fb6dc..75dd51ca47 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pipeline.hh +++ b/src/mongocxx/lib/mongocxx/private/pipeline.hh @@ -18,7 +18,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { @@ -47,4 +47,4 @@ class pipeline::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pool.hh b/src/mongocxx/lib/mongocxx/private/pool.hh similarity index 93% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pool.hh rename to src/mongocxx/lib/mongocxx/private/pool.hh index 717ce6e28d..9bd130bafa 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pool.hh +++ b/src/mongocxx/lib/mongocxx/private/pool.hh @@ -18,9 +18,9 @@ #include #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { @@ -47,4 +47,4 @@ class pool::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_concern.hh b/src/mongocxx/lib/mongocxx/private/read_concern.hh similarity index 92% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_concern.hh rename to src/mongocxx/lib/mongocxx/private/read_concern.hh index 00cff1cacf..762ebc9c00 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_concern.hh +++ b/src/mongocxx/lib/mongocxx/private/read_concern.hh @@ -14,10 +14,10 @@ #pragma once -#include #include -#include +#include +#include namespace mongocxx { namespace v_noabi { @@ -42,4 +42,4 @@ class read_concern::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_preference.hh b/src/mongocxx/lib/mongocxx/private/read_preference.hh similarity index 92% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_preference.hh rename to src/mongocxx/lib/mongocxx/private/read_preference.hh index b4410aa1b0..d0f7437cba 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_preference.hh +++ b/src/mongocxx/lib/mongocxx/private/read_preference.hh @@ -14,10 +14,10 @@ #pragma once -#include #include -#include +#include +#include namespace mongocxx { namespace v_noabi { @@ -42,4 +42,4 @@ class read_preference::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/scoped_bson_value.hh b/src/mongocxx/lib/mongocxx/private/scoped_bson_value.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/scoped_bson_value.hh rename to src/mongocxx/lib/mongocxx/private/scoped_bson_value.hh diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_model.hh b/src/mongocxx/lib/mongocxx/private/search_index_model.hh similarity index 88% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_model.hh rename to src/mongocxx/lib/mongocxx/private/search_index_model.hh index f6b9581240..0d1e4ce445 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_model.hh +++ b/src/mongocxx/lib/mongocxx/private/search_index_model.hh @@ -4,7 +4,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { @@ -23,4 +23,4 @@ class search_index_model::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_view.hh b/src/mongocxx/lib/mongocxx/private/search_index_view.hh similarity index 98% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_view.hh rename to src/mongocxx/lib/mongocxx/private/search_index_view.hh index 88b7ce0ed7..f9c28f09fd 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_view.hh +++ b/src/mongocxx/lib/mongocxx/private/search_index_view.hh @@ -7,13 +7,13 @@ #include #include +#include + #include #include +#include #include #include -#include - -#include namespace mongocxx { namespace v_noabi { @@ -206,4 +206,4 @@ class search_index_view::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/uri.hh b/src/mongocxx/lib/mongocxx/private/uri.hh similarity index 92% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/uri.hh rename to src/mongocxx/lib/mongocxx/private/uri.hh index ad8edf0706..22619bcb1f 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/uri.hh +++ b/src/mongocxx/lib/mongocxx/private/uri.hh @@ -14,10 +14,10 @@ #pragma once -#include #include -#include +#include +#include namespace mongocxx { namespace v_noabi { @@ -38,4 +38,4 @@ class uri::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/write_concern.hh b/src/mongocxx/lib/mongocxx/private/write_concern.hh similarity index 92% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/write_concern.hh rename to src/mongocxx/lib/mongocxx/private/write_concern.hh index 3cd9ca5941..53377d11f6 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/write_concern.hh +++ b/src/mongocxx/lib/mongocxx/private/write_concern.hh @@ -14,10 +14,10 @@ #pragma once -#include #include -#include +#include +#include namespace mongocxx { namespace v_noabi { @@ -42,4 +42,4 @@ class write_concern::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/export_for_testing.hh b/src/mongocxx/lib/mongocxx/test_util/export_for_testing.hh similarity index 82% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/export_for_testing.hh rename to src/mongocxx/lib/mongocxx/test_util/export_for_testing.hh index 4a0d149113..9e7a642dfa 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/export_for_testing.hh +++ b/src/mongocxx/lib/mongocxx/test_util/export_for_testing.hh @@ -14,9 +14,9 @@ #pragma once -#include +#include -// See src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/test_util/export_for_testing.hh for an explanation of +// See src/bsoncxx/lib/bsoncxx/test_util/export_for_testing.hh for an explanation of // the purpose of this header. #if defined(MONGOCXX_TESTING) @@ -27,4 +27,4 @@ #define MONGOCXX_ABI_EXPORT_CDECL_TESTING(...) __VA_ARGS__ #endif -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/mock.hh b/src/mongocxx/lib/mongocxx/test_util/mock.hh similarity index 98% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/mock.hh rename to src/mongocxx/lib/mongocxx/test_util/mock.hh index e505aa9d28..7fa69c505b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/mock.hh +++ b/src/mongocxx/lib/mongocxx/test_util/mock.hh @@ -28,7 +28,7 @@ #include -#include +#include namespace mongocxx { namespace test_util { @@ -188,4 +188,4 @@ class mock { } // namespace test_util } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp index a34839c209..339062adc2 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp @@ -14,22 +14,23 @@ #include #include -#include #include #include #include #include #include + +#include + #include #include #include +#include #include #include #include -#include - namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp index 611b05d60a..bc0b53d742 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp @@ -14,14 +14,14 @@ #include +#include + #include -#include #include +#include #include -#include - namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp index adad108180..4d3df46796 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp @@ -13,7 +13,6 @@ // limitations under the License. #include -#include #include #include @@ -24,8 +23,12 @@ #include #include #include + +#include + #include #include +#include #include #include #include @@ -33,8 +36,6 @@ #include #include -#include - namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp index 796f2cf7af..24c53b7540 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include -#include #include +#include #include -#include - namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp index e127ceb648..026784dd3c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include #include + +#include + #include #include - -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp index c5f9a8cc59..56668e191f 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp @@ -24,9 +24,6 @@ #include #include #include -#include -#include -#include #include #include @@ -41,9 +38,21 @@ #include #include #include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + #include #include #include +#include #include #include #include @@ -51,14 +60,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include - -#include using bsoncxx::v_noabi::builder::concatenate; using bsoncxx::v_noabi::builder::basic::kvp; diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp index 599b2dd203..a1962ff37d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include #include #include + +#include +#include + +#include #include #include -#include - namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp index 6f0997ed5b..c6ad181477 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -26,8 +25,12 @@ #include #include #include + +#include + #include #include +#include #include #include #include @@ -35,8 +38,6 @@ #include #include -#include - using bsoncxx::v_noabi::builder::concatenate; using bsoncxx::v_noabi::builder::basic::kvp; using bsoncxx::v_noabi::builder::basic::make_document; diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp index 8996192c80..481df2fafe 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp @@ -13,16 +13,17 @@ // limitations under the License. #include +#include + +#include + #include #include #include -#include -#include +#include #include -#include - namespace mongocxx { namespace v_noabi { namespace events { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp index e9b7900ecf..4b5edd317c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include -#include +#include #include -#include - namespace mongocxx { namespace v_noabi { namespace events { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp index 965c532fa3..eb8c7f8f46 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include -#include +#include #include -#include - namespace mongocxx { namespace v_noabi { namespace events { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp index 110d7b6301..f7e452ef40 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp index a19d348690..cf1a60a5fe 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp index e8728fed05..3d2b96ecba 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp index 3729355f8e..c3c30893b6 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp index 814381b9dc..d7ec0a4d24 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp index 3e8120d13d..1c7a713166 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp index 5e97cf7d51..3b837469b6 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp index 03c1072d44..c350028d87 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp index 73d73254c7..9945c2bf0c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp index f47b1d7e07..025c0945f6 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp @@ -13,11 +13,11 @@ // limitations under the License. #include + +#include #include #include -#include - namespace mongocxx { namespace v_noabi { namespace events { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp index 6daededbac..774c71f3b0 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp index 3a657d74d3..a77b57418d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp index 02d59c4f8d..c395747418 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp @@ -18,11 +18,11 @@ #include #include + +#include #include #include -#include - namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh index 86d3263204..cd772b8bd4 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh @@ -18,9 +18,9 @@ #include #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { @@ -65,4 +65,4 @@ void throw_exception(bsoncxx::v_noabi::document::value raw_server_error, ::bson_ } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp index 0157369eb0..6e8baa63bf 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp index a59a44f9f0..371d3eb258 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include @@ -32,9 +31,11 @@ #include #include #include -#include -#include +#include + +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp index f771c9533e..0b83449e02 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp @@ -17,16 +17,17 @@ #include #include -#include #include #include #include #include #include -#include -#include +#include + +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh index 5910a47f76..531babd964 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh @@ -20,7 +20,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { @@ -55,4 +55,4 @@ class bucket::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh index 01959bb3b4..0e856a980b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh @@ -21,7 +21,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { @@ -117,4 +117,4 @@ class downloader::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh index b29a09f1e2..1f04bc4081 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh @@ -17,12 +17,13 @@ #include #include -#include #include #include -#include +#include + +#include namespace mongocxx { namespace v_noabi { @@ -91,4 +92,4 @@ class uploader::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp index d8127033c6..658f8b9df6 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include namespace { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp index 2aac5c6013..67fca5358d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp @@ -18,7 +18,7 @@ #include -#include +#include using bsoncxx::v_noabi::builder::concatenate; using bsoncxx::v_noabi::builder::basic::kvp; diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp index 75e4a65f80..b899925e22 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp index 31d91f53af..434ea14cbb 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include #include #include #include #include #include -#include -#include +#include + +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp index 233a11699a..eeb9f9f86a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp @@ -19,15 +19,15 @@ #include #include -#include - #include #include #include #include -#include -#include +#include + +#include +#include #if !defined(__has_feature) #define __has_feature(x) 0 diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp index c6fab67c06..715d243ffd 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp index c28a0df4e2..d719fbb624 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp index 464c2438cd..d969e8b6e8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp index 8f52f8d406..dcc2c849d8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp index c20f699f45..98f2eb185b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp index 32d612ca0a..51fc548670 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp index ab0c6d8791..b69144ede6 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp index b8ec8d3247..b4dbee3e14 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp index 4eaa0fa53f..24fdfb2239 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp @@ -15,11 +15,11 @@ #include #include + #include +#include #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp index d618ae9aa7..33bbe96257 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp index 06f4c9e8c8..eed07082a1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp @@ -17,13 +17,13 @@ #include #include #include + #include +#include #include #include #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp index 54c35e23af..6f46732a53 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp index 6bcc666ce3..2eb65f5710 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp index 51060e0fa7..517b3ebe82 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp index b6d0c62385..84cd7da3d4 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp @@ -14,12 +14,12 @@ #include #include + #include +#include #include #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp index 8837cfdc2c..9065fff6f1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp index 214fa2e4da..50d5c504f9 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp index f85a212e34..dca624fc5d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp @@ -13,6 +13,7 @@ // limitations under the License. #include + #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp index b2bc4220fd..6a2d068c1a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp index c25eadb10d..bdfaa7faab 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp index 9fe5d4ec0f..04b0c782c3 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp @@ -19,12 +19,12 @@ #include #include #include + +#include #include #include #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp index 8b6953e73f..e0adf00af0 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp index c1c1a1e038..368ed52464 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp index 33348d0edb..50a50f7a2a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp index 12d2e58232..c387e29ea1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp index a6f0e1e182..0da05986ca 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp index 23f586cd52..8a806772a2 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp index 44193053b9..5f877e66b1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp index 646a4b7bc2..9ae8fdd0fb 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp @@ -13,14 +13,15 @@ // limitations under the License. #include -#include #include #include #include -#include -#include +#include + +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp index a69a00add7..4127ab9590 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp @@ -18,7 +18,7 @@ #include -#include +#include using bsoncxx::v_noabi::builder::basic::kvp; using bsoncxx::v_noabi::builder::basic::make_document; diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp index 5dab1b323f..77aab15725 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp index eb5ab5ddc6..2df55ce1c5 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh index b8aed4fc01..e2104a4431 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh @@ -17,9 +17,9 @@ #include #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { @@ -169,4 +169,4 @@ inline apm_unique_callbacks make_apm_callbacks(apm const& apm_opts) { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh index 9a75b84f26..42f311a29d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh @@ -18,9 +18,9 @@ #include #include #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { @@ -60,4 +60,4 @@ inline unique_server_api make_server_api(server_api const& opts) { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh index b4ead06506..bb72cf4fc9 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh @@ -17,9 +17,9 @@ #include #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { @@ -57,4 +57,4 @@ inline std::pair<::mongoc_ssl_opt_t, std::list +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh index 3e6c8b89e8..1784a53b92 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh @@ -19,12 +19,11 @@ #include +#include #include #include #include -#include - namespace mongocxx { namespace v_noabi { namespace options { @@ -131,4 +130,4 @@ class transaction::impl { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp index 8538b57b8a..86ce6b0a7a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp index de474b7ed3..85326b7fed 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp @@ -17,11 +17,11 @@ #include #include #include + +#include #include #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp index c0f4a5991b..fd8b9bb180 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp @@ -19,9 +19,9 @@ #include #include #include -#include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp index 9eefbdc7bb..a641fb3259 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp index bbca2812a5..0af76c51ad 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include #include #include -#include +#include + +#include namespace mongocxx { namespace v_noabi { @@ -91,4 +91,4 @@ transaction::impl& transaction::_get_impl() { } // namespace v_noabi } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp index 016e105d01..c3103f2025 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp @@ -17,7 +17,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp index 474449b290..1bd06bb27b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp @@ -14,12 +14,13 @@ #include #include -#include #include -#include -#include +#include + +#include +#include using bsoncxx::v_noabi::builder::basic::kvp; using bsoncxx::v_noabi::builder::basic::sub_document; diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp index ed14353654..1053c64677 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp @@ -14,8 +14,6 @@ #include -#include - #include #include #include @@ -25,12 +23,14 @@ #include #include #include + +#include + #include +#include #include #include -#include - namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp index aee5101e4f..1d349e1793 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp @@ -13,16 +13,17 @@ // limitations under the License. #include -#include #include #include #include -#include -#include #include -#include +#include + +#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp index 68f2d693d9..8eda311681 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp @@ -12,18 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include #include #include #include +#include + +#include + +#include #include #include #include #include -#include - -#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp index 37e27a6257..8b8383976d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp index b8751ac7e1..acba6e8598 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp index 440c036f63..0fb9042a18 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp index 08a2ed89b6..1590ecb452 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp index b61b208635..fc880db56c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp index 33c61bc985..f918708670 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp index e66c31c0fc..96507fa04c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp @@ -13,10 +13,10 @@ // limitations under the License. #include -#include #include -#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp index a7901aa160..0ba802326e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp index 00bde7223d..9f0b30dd31 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp @@ -1,11 +1,11 @@ -#include - #include #include -#include #include -#include +#include + +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp index cf40b45c9f..da1db484db 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp @@ -1,11 +1,11 @@ -#include - #include #include -#include #include -#include +#include + +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp index 7293c8fb0f..12b09f701f 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include #include #include #include +#include + +#include + +#include #include #include #include #include #include -#include - -#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp index 040f88ec49..b4b536ef03 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp @@ -20,7 +20,7 @@ #include -#include +#include namespace { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp index c03b7f5018..bfd995e5f1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp @@ -15,17 +15,18 @@ #include #include -#include #include #include #include #include -#include -#include #include -#include +#include + +#include +#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/test/bulk_write.cpp b/src/mongocxx/test/bulk_write.cpp index 73682e7958..12856966ae 100644 --- a/src/mongocxx/test/bulk_write.cpp +++ b/src/mongocxx/test/bulk_write.cpp @@ -18,9 +18,10 @@ #include #include #include -#include #include +#include + #include #include diff --git a/src/mongocxx/test/catch_helpers.hh b/src/mongocxx/test/catch_helpers.hh index 0bcf1b7f07..5ba4879b8a 100644 --- a/src/mongocxx/test/catch_helpers.hh +++ b/src/mongocxx/test/catch_helpers.hh @@ -15,9 +15,9 @@ #pragma once #include -#include -#include +#include +#include #include @@ -258,4 +258,4 @@ class mongocxx_exception_matcher : public Catch::Matchers::MatcherBase +#include diff --git a/src/mongocxx/test/change_streams.cpp b/src/mongocxx/test/change_streams.cpp index f6c5f4dea3..75cacb216c 100644 --- a/src/mongocxx/test/change_streams.cpp +++ b/src/mongocxx/test/change_streams.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include @@ -26,9 +25,12 @@ #include #include #include -#include #include +#include + +#include + #include #include diff --git a/src/mongocxx/test/client.cpp b/src/mongocxx/test/client.cpp index db06bdbae5..89f17a8bd5 100644 --- a/src/mongocxx/test/client.cpp +++ b/src/mongocxx/test/client.cpp @@ -18,11 +18,11 @@ #include #include #include -#include -#include #include -#include +#include +#include +#include #include diff --git a/src/mongocxx/test/client_helpers.cpp b/src/mongocxx/test/client_helpers.cpp index a61ae47e6d..ebf40e8d5a 100644 --- a/src/mongocxx/test/client_helpers.cpp +++ b/src/mongocxx/test/client_helpers.cpp @@ -35,12 +35,12 @@ #include #include #include + +#include #include #include -#include - #include #include diff --git a/src/mongocxx/test/client_helpers.hh b/src/mongocxx/test/client_helpers.hh index 5b531c47c8..624562997b 100644 --- a/src/mongocxx/test/client_helpers.hh +++ b/src/mongocxx/test/client_helpers.hh @@ -31,9 +31,9 @@ #include #include #include -#include -#include +#include +#include #include @@ -250,4 +250,4 @@ std::string getenv_or_fail(const std::string env_name); } // namespace test_util } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/test/client_session.cpp b/src/mongocxx/test/client_session.cpp index dd4709050e..5150badcd4 100644 --- a/src/mongocxx/test/client_session.cpp +++ b/src/mongocxx/test/client_session.cpp @@ -14,14 +14,15 @@ #include -#include -#include - #include #include #include #include #include + +#include +#include + #include #include diff --git a/src/mongocxx/test/client_side_encryption.cpp b/src/mongocxx/test/client_side_encryption.cpp index 2547e15a74..a1f0896c8a 100644 --- a/src/mongocxx/test/client_side_encryption.cpp +++ b/src/mongocxx/test/client_side_encryption.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -38,10 +37,13 @@ #include #include #include -#include #include #include +#include + +#include + #include #include diff --git a/src/mongocxx/test/collection.cpp b/src/mongocxx/test/collection.cpp index 1d61af8876..c65ef0b6f5 100644 --- a/src/mongocxx/test/collection.cpp +++ b/src/mongocxx/test/collection.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include #include @@ -34,11 +33,14 @@ #include #include #include -#include -#include #include #include +#include + +#include +#include + #include #include diff --git a/src/mongocxx/test/collection_mocked.cpp b/src/mongocxx/test/collection_mocked.cpp index 47eb71e6ea..1d52908f6f 100644 --- a/src/mongocxx/test/collection_mocked.cpp +++ b/src/mongocxx/test/collection_mocked.cpp @@ -18,8 +18,6 @@ #include #include #include -#include -#include #include #include @@ -30,10 +28,14 @@ #include #include #include +#include + +#include +#include + #include #include #include -#include #include diff --git a/src/mongocxx/test/conversions.cpp b/src/mongocxx/test/conversions.cpp index 3bdf8cea1a..91ca3c7df6 100644 --- a/src/mongocxx/test/conversions.cpp +++ b/src/mongocxx/test/conversions.cpp @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include #include +#include + #include namespace { diff --git a/src/mongocxx/test/database.cpp b/src/mongocxx/test/database.cpp index f8fd931694..271b17eb3d 100644 --- a/src/mongocxx/test/database.cpp +++ b/src/mongocxx/test/database.cpp @@ -24,6 +24,7 @@ #include #include #include + #include #include #include diff --git a/src/mongocxx/test/logging.cpp b/src/mongocxx/test/logging.cpp index 72c6993a96..9bf659093a 100644 --- a/src/mongocxx/test/logging.cpp +++ b/src/mongocxx/test/logging.cpp @@ -14,10 +14,11 @@ #include -#include - #include #include + +#include + #include #include diff --git a/src/mongocxx/test/options/index.cpp b/src/mongocxx/test/options/index.cpp index 2c30027e5b..a790c90ae2 100644 --- a/src/mongocxx/test/options/index.cpp +++ b/src/mongocxx/test/options/index.cpp @@ -13,12 +13,13 @@ // limitations under the License. #include -#include #include #include #include +#include + #include #include diff --git a/src/mongocxx/test/pool.cpp b/src/mongocxx/test/pool.cpp index b9cf52630b..a7aa60098b 100644 --- a/src/mongocxx/test/pool.cpp +++ b/src/mongocxx/test/pool.cpp @@ -20,9 +20,9 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/src/mongocxx/test/private/write_concern.cpp b/src/mongocxx/test/private/write_concern.cpp index c2b3f8da7d..1ffd82aabe 100644 --- a/src/mongocxx/test/private/write_concern.cpp +++ b/src/mongocxx/test/private/write_concern.cpp @@ -13,9 +13,10 @@ // limitations under the License. #include +#include + #include #include -#include #include diff --git a/src/mongocxx/test/read_preference.cpp b/src/mongocxx/test/read_preference.cpp index 30e30532d7..4920c5fc72 100644 --- a/src/mongocxx/test/read_preference.cpp +++ b/src/mongocxx/test/read_preference.cpp @@ -18,9 +18,10 @@ #include #include -#include #include +#include + #include #include diff --git a/src/mongocxx/test/spec/gridfs.cpp b/src/mongocxx/test/spec/gridfs.cpp index a45b7202ff..aacbba2ce3 100644 --- a/src/mongocxx/test/spec/gridfs.cpp +++ b/src/mongocxx/test/spec/gridfs.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -41,6 +40,8 @@ #include #include +#include + #include #include diff --git a/src/mongocxx/test/spec/monitoring.cpp b/src/mongocxx/test/spec/monitoring.cpp index 6015d6c1cb..acdbbb65fd 100644 --- a/src/mongocxx/test/spec/monitoring.cpp +++ b/src/mongocxx/test/spec/monitoring.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include #include @@ -357,4 +357,4 @@ void apm_checker::clear() { } // namespace spec } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/test/spec/monitoring.hh b/src/mongocxx/test/spec/monitoring.hh index 0b3888f391..b7a2ece458 100644 --- a/src/mongocxx/test/spec/monitoring.hh +++ b/src/mongocxx/test/spec/monitoring.hh @@ -16,7 +16,7 @@ #include -#include +#include #include #include @@ -88,4 +88,4 @@ class apm_checker { } // namespace spec } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/test/spec/operation.cpp b/src/mongocxx/test/spec/operation.cpp index adb792142a..5a4837182b 100644 --- a/src/mongocxx/test/spec/operation.cpp +++ b/src/mongocxx/test/spec/operation.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include @@ -1580,4 +1580,4 @@ document::value operation_runner::run(document::view operation) { } // namespace spec } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/test/spec/operation.hh b/src/mongocxx/test/spec/operation.hh index 6e8bd2d37e..11ae36c569 100644 --- a/src/mongocxx/test/spec/operation.hh +++ b/src/mongocxx/test/spec/operation.hh @@ -22,9 +22,9 @@ #include #include -#include -#include +#include +#include namespace mongocxx { namespace spec { @@ -88,4 +88,4 @@ class operation_runner { } // namespace spec } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/test/spec/unified_tests/assert.hh b/src/mongocxx/test/spec/unified_tests/assert.hh index a3be3294ba..6f4394f42c 100644 --- a/src/mongocxx/test/spec/unified_tests/assert.hh +++ b/src/mongocxx/test/spec/unified_tests/assert.hh @@ -18,7 +18,7 @@ #include -#include +#include namespace mongocxx { namespace assert { @@ -33,4 +33,4 @@ void matches( } // namespace assert } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/test/spec/unified_tests/entity.hh b/src/mongocxx/test/spec/unified_tests/entity.hh index 418f2b26e0..a25a11b6d4 100644 --- a/src/mongocxx/test/spec/unified_tests/entity.hh +++ b/src/mongocxx/test/spec/unified_tests/entity.hh @@ -22,7 +22,7 @@ #include #include -#include +#include namespace mongocxx { namespace entity { @@ -90,4 +90,4 @@ class map { } // namespace entity } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/test/spec/unified_tests/operations.hh b/src/mongocxx/test/spec/unified_tests/operations.hh index 1c088c4215..f39a74b1b5 100644 --- a/src/mongocxx/test/spec/unified_tests/operations.hh +++ b/src/mongocxx/test/spec/unified_tests/operations.hh @@ -22,7 +22,7 @@ #include #include -#include +#include #include @@ -47,4 +47,4 @@ bsoncxx::stdx::optional lookup_read_preference(bsoncxx::documen } // namespace operations } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/test/spec/util.cpp b/src/mongocxx/test/spec/util.cpp index 1ce5989137..3f32c9830f 100644 --- a/src/mongocxx/test/spec/util.cpp +++ b/src/mongocxx/test/spec/util.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include @@ -1121,4 +1121,4 @@ void run_crud_tests_in_file(std::string const& test_path, uri test_uri) { } // namespace spec } // namespace mongocxx -#include +#include diff --git a/src/mongocxx/test/spec/util.hh b/src/mongocxx/test/spec/util.hh index 68aa0c8089..c453d3f64e 100644 --- a/src/mongocxx/test/spec/util.hh +++ b/src/mongocxx/test/spec/util.hh @@ -23,7 +23,7 @@ #include #include -#include +#include #include @@ -127,4 +127,4 @@ void run_crud_tests_in_file(std::string const& test_path, uri test_uri = uri{}); } // namespace spec } // namespace mongocxx -#include +#include From 6033b0f618930918166edf3ed3570ab70d897878 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 16 Jan 2025 10:19:20 -0600 Subject: [PATCH 03/22] Rename private/export.hh <- test_util/export_for_testing.hh --- src/bsoncxx/lib/CMakeLists.txt | 2 +- .../{test_util/export_for_testing.hh => private/export.hh} | 0 src/bsoncxx/lib/bsoncxx/private/itoa.hh | 3 +-- src/mongocxx/lib/CMakeLists.txt | 2 +- src/mongocxx/lib/mongocxx/private/conversions.hh | 2 +- .../{test_util/export_for_testing.hh => private/export.hh} | 2 +- src/mongocxx/lib/mongocxx/private/libbson.hh | 3 +-- src/mongocxx/lib/mongocxx/private/libmongoc.hh | 2 +- src/mongocxx/lib/mongocxx/private/numeric_casting.hh | 3 +-- 9 files changed, 8 insertions(+), 11 deletions(-) rename src/bsoncxx/lib/bsoncxx/{test_util/export_for_testing.hh => private/export.hh} (100%) rename src/mongocxx/lib/mongocxx/{test_util/export_for_testing.hh => private/export.hh} (92%) diff --git a/src/bsoncxx/lib/CMakeLists.txt b/src/bsoncxx/lib/CMakeLists.txt index c5a6930cae..c9cca6046b 100644 --- a/src/bsoncxx/lib/CMakeLists.txt +++ b/src/bsoncxx/lib/CMakeLists.txt @@ -92,13 +92,13 @@ set_dist_list(src_bsoncxx_lib_DIST bsoncxx/private/config/config.hh.in bsoncxx/private/config/postlude.hh bsoncxx/private/config/prelude.hh + bsoncxx/private/export.hh bsoncxx/private/helpers.hh bsoncxx/private/itoa.hh bsoncxx/private/libbson.hh bsoncxx/private/make_unique.hh bsoncxx/private/stack.hh bsoncxx/private/suppress_deprecation_warnings.hh - bsoncxx/test_util/export_for_testing.hh bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh bsoncxx/v_noabi/bsoncxx/types/private/convert.hh bsoncxx/v1/config/config.hpp.in diff --git a/src/bsoncxx/lib/bsoncxx/test_util/export_for_testing.hh b/src/bsoncxx/lib/bsoncxx/private/export.hh similarity index 100% rename from src/bsoncxx/lib/bsoncxx/test_util/export_for_testing.hh rename to src/bsoncxx/lib/bsoncxx/private/export.hh diff --git a/src/bsoncxx/lib/bsoncxx/private/itoa.hh b/src/bsoncxx/lib/bsoncxx/private/itoa.hh index 43fc24d67d..05f73f8768 100644 --- a/src/bsoncxx/lib/bsoncxx/private/itoa.hh +++ b/src/bsoncxx/lib/bsoncxx/private/itoa.hh @@ -17,9 +17,8 @@ #include #include -#include - #include +#include namespace bsoncxx { diff --git a/src/mongocxx/lib/CMakeLists.txt b/src/mongocxx/lib/CMakeLists.txt index 180404c031..64114d9959 100644 --- a/src/mongocxx/lib/CMakeLists.txt +++ b/src/mongocxx/lib/CMakeLists.txt @@ -194,6 +194,7 @@ set_dist_list(src_mongocxx_lib_DIST mongocxx/private/conversions.hh mongocxx/private/cursor.hh mongocxx/private/database.hh + mongocxx/private/export.hh mongocxx/private/index_view.hh mongocxx/private/libbson.hh mongocxx/private/libmongoc_symbols.hh @@ -208,7 +209,6 @@ set_dist_list(src_mongocxx_lib_DIST mongocxx/private/search_index_view.hh mongocxx/private/uri.hh mongocxx/private/write_concern.hh - mongocxx/test_util/export_for_testing.hh mongocxx/test_util/mock.hh mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh diff --git a/src/mongocxx/lib/mongocxx/private/conversions.hh b/src/mongocxx/lib/mongocxx/private/conversions.hh index 028418b5c6..acf4d26851 100644 --- a/src/mongocxx/lib/mongocxx/private/conversions.hh +++ b/src/mongocxx/lib/mongocxx/private/conversions.hh @@ -15,9 +15,9 @@ #pragma once #include -#include #include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/test_util/export_for_testing.hh b/src/mongocxx/lib/mongocxx/private/export.hh similarity index 92% rename from src/mongocxx/lib/mongocxx/test_util/export_for_testing.hh rename to src/mongocxx/lib/mongocxx/private/export.hh index 9e7a642dfa..36661e9ee0 100644 --- a/src/mongocxx/lib/mongocxx/test_util/export_for_testing.hh +++ b/src/mongocxx/lib/mongocxx/private/export.hh @@ -16,7 +16,7 @@ #include -// See src/bsoncxx/lib/bsoncxx/test_util/export_for_testing.hh for an explanation of +// See src/bsoncxx/lib/bsoncxx/private/export.hh for an explanation of // the purpose of this header. #if defined(MONGOCXX_TESTING) diff --git a/src/mongocxx/lib/mongocxx/private/libbson.hh b/src/mongocxx/lib/mongocxx/private/libbson.hh index 4117fe9bbc..4a7b8d7426 100644 --- a/src/mongocxx/lib/mongocxx/private/libbson.hh +++ b/src/mongocxx/lib/mongocxx/private/libbson.hh @@ -19,11 +19,10 @@ #include #include -#include - #include #include +#include namespace mongocxx { namespace libbson { diff --git a/src/mongocxx/lib/mongocxx/private/libmongoc.hh b/src/mongocxx/lib/mongocxx/private/libmongoc.hh index 6be7c50709..ace93a0a0a 100644 --- a/src/mongocxx/lib/mongocxx/private/libmongoc.hh +++ b/src/mongocxx/lib/mongocxx/private/libmongoc.hh @@ -34,10 +34,10 @@ // TODO: CXX-1366 Disable MSVC warnings for libmongoc #endif -#include #include #include +#include namespace mongocxx { namespace libmongoc { diff --git a/src/mongocxx/lib/mongocxx/private/numeric_casting.hh b/src/mongocxx/lib/mongocxx/private/numeric_casting.hh index e8106f5136..a5daecdc57 100644 --- a/src/mongocxx/lib/mongocxx/private/numeric_casting.hh +++ b/src/mongocxx/lib/mongocxx/private/numeric_casting.hh @@ -17,9 +17,8 @@ #include #include -#include - #include +#include namespace mongocxx { From 973bf1bf18c793ab1f2dfbe08dbdd171790838e0 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 16 Jan 2025 10:19:21 -0600 Subject: [PATCH 04/22] Rename private/mock.hh <- test_util/mock.hh --- src/mongocxx/lib/CMakeLists.txt | 2 +- src/mongocxx/lib/mongocxx/private/libmongoc.hh | 3 +-- src/mongocxx/lib/mongocxx/{test_util => private}/mock.hh | 0 3 files changed, 2 insertions(+), 3 deletions(-) rename src/mongocxx/lib/mongocxx/{test_util => private}/mock.hh (100%) diff --git a/src/mongocxx/lib/CMakeLists.txt b/src/mongocxx/lib/CMakeLists.txt index 64114d9959..7b71a266f0 100644 --- a/src/mongocxx/lib/CMakeLists.txt +++ b/src/mongocxx/lib/CMakeLists.txt @@ -199,6 +199,7 @@ set_dist_list(src_mongocxx_lib_DIST mongocxx/private/libbson.hh mongocxx/private/libmongoc_symbols.hh mongocxx/private/libmongoc.hh + mongocxx/private/mock.hh mongocxx/private/numeric_casting.hh mongocxx/private/pipeline.hh mongocxx/private/pool.hh @@ -209,7 +210,6 @@ set_dist_list(src_mongocxx_lib_DIST mongocxx/private/search_index_view.hh mongocxx/private/uri.hh mongocxx/private/write_concern.hh - mongocxx/test_util/mock.hh mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh diff --git a/src/mongocxx/lib/mongocxx/private/libmongoc.hh b/src/mongocxx/lib/mongocxx/private/libmongoc.hh index ace93a0a0a..037d4b6f7d 100644 --- a/src/mongocxx/lib/mongocxx/private/libmongoc.hh +++ b/src/mongocxx/lib/mongocxx/private/libmongoc.hh @@ -34,10 +34,9 @@ // TODO: CXX-1366 Disable MSVC warnings for libmongoc #endif -#include - #include #include +#include namespace mongocxx { namespace libmongoc { diff --git a/src/mongocxx/lib/mongocxx/test_util/mock.hh b/src/mongocxx/lib/mongocxx/private/mock.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/test_util/mock.hh rename to src/mongocxx/lib/mongocxx/private/mock.hh From 0613b7745adae6cbaf522f232bfba5da31a3b1ab Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 16 Jan 2025 10:19:21 -0600 Subject: [PATCH 05/22] Add transitive inclusion of export.hpp --- src/bsoncxx/lib/bsoncxx/private/export.hh | 2 ++ src/mongocxx/lib/mongocxx/private/export.hh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/bsoncxx/lib/bsoncxx/private/export.hh b/src/bsoncxx/lib/bsoncxx/private/export.hh index bd75d3e024..75d040551d 100644 --- a/src/bsoncxx/lib/bsoncxx/private/export.hh +++ b/src/bsoncxx/lib/bsoncxx/private/export.hh @@ -14,6 +14,8 @@ #pragma once +#include + #include // The BSONCXX_TESTING macro is intended to be used for exporting symbols for testing which are not diff --git a/src/mongocxx/lib/mongocxx/private/export.hh b/src/mongocxx/lib/mongocxx/private/export.hh index 36661e9ee0..a19ab84263 100644 --- a/src/mongocxx/lib/mongocxx/private/export.hh +++ b/src/mongocxx/lib/mongocxx/private/export.hh @@ -14,6 +14,8 @@ #pragma once +#include + #include // See src/bsoncxx/lib/bsoncxx/private/export.hh for an explanation of From ac2fecc67c2ccd17cfa07397cdb892825211a5b9 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 16 Jan 2025 10:19:21 -0600 Subject: [PATCH 06/22] Remove internal macro guard headers --- src/bsoncxx/lib/CMakeLists.txt | 2 -- .../lib/bsoncxx/private/config/postlude.hh | 18 ------------ .../lib/bsoncxx/private/config/prelude.hh | 20 ------------- src/bsoncxx/lib/bsoncxx/private/export.hh | 6 ---- src/bsoncxx/lib/bsoncxx/private/helpers.hh | 3 -- src/bsoncxx/lib/bsoncxx/private/itoa.cpp | 1 - src/bsoncxx/lib/bsoncxx/private/itoa.hh | 3 -- src/bsoncxx/lib/bsoncxx/private/stack.hh | 4 --- .../bsoncxx/v_noabi/bsoncxx/array/element.cpp | 2 -- .../bsoncxx/v_noabi/bsoncxx/array/value.cpp | 2 -- .../bsoncxx/v_noabi/bsoncxx/array/view.cpp | 1 - .../bsoncxx/v_noabi/bsoncxx/builder/core.cpp | 1 - .../bsoncxx/v_noabi/bsoncxx/decimal128.cpp | 1 - .../v_noabi/bsoncxx/document/element.cpp | 1 - .../v_noabi/bsoncxx/document/value.cpp | 2 -- .../bsoncxx/v_noabi/bsoncxx/document/view.cpp | 1 - .../v_noabi/bsoncxx/exception/error_code.cpp | 2 -- .../lib/bsoncxx/v_noabi/bsoncxx/json.cpp | 1 - .../lib/bsoncxx/v_noabi/bsoncxx/oid.cpp | 1 - .../v_noabi/bsoncxx/string/view_or_value.cpp | 2 -- .../lib/bsoncxx/v_noabi/bsoncxx/types.cpp | 2 -- .../bsoncxx/types/bson_value/private/value.hh | 3 -- .../bsoncxx/types/bson_value/value.cpp | 1 - .../v_noabi/bsoncxx/types/bson_value/view.cpp | 1 - .../v_noabi/bsoncxx/types/private/convert.hh | 3 -- .../lib/bsoncxx/v_noabi/bsoncxx/validate.cpp | 1 - src/bsoncxx/test/catch.hh | 4 --- src/bsoncxx/test/exception_guard.hh | 4 --- src/bsoncxx/test/to_string.hh | 4 --- src/mongocxx/lib/CMakeLists.txt | 2 -- .../private/append_aggregate_options.hh | 4 --- .../lib/mongocxx/private/bulk_write.hh | 3 -- .../lib/mongocxx/private/change_stream.hh | 3 -- src/mongocxx/lib/mongocxx/private/client.hh | 3 -- .../lib/mongocxx/private/client_encryption.hh | 3 -- .../lib/mongocxx/private/client_session.hh | 3 -- .../lib/mongocxx/private/collection.hh | 3 -- .../lib/mongocxx/private/config/postlude.hh | 26 ----------------- .../lib/mongocxx/private/config/prelude.hh | 28 ------------------- .../lib/mongocxx/private/conversions.cpp | 1 - .../lib/mongocxx/private/conversions.hh | 3 -- src/mongocxx/lib/mongocxx/private/cursor.hh | 3 -- src/mongocxx/lib/mongocxx/private/database.hh | 3 -- src/mongocxx/lib/mongocxx/private/export.hh | 6 ---- .../lib/mongocxx/private/index_view.hh | 3 -- src/mongocxx/lib/mongocxx/private/libbson.cpp | 1 - src/mongocxx/lib/mongocxx/private/libbson.hh | 3 -- .../lib/mongocxx/private/libmongoc.cpp | 2 -- .../lib/mongocxx/private/libmongoc.hh | 3 -- src/mongocxx/lib/mongocxx/private/mock.hh | 4 --- .../lib/mongocxx/private/numeric_casting.cpp | 1 - .../lib/mongocxx/private/numeric_casting.hh | 3 -- src/mongocxx/lib/mongocxx/private/pipeline.hh | 4 --- src/mongocxx/lib/mongocxx/private/pool.hh | 3 -- .../lib/mongocxx/private/read_concern.hh | 3 -- .../lib/mongocxx/private/read_preference.hh | 3 -- .../mongocxx/private/search_index_model.hh | 4 --- .../lib/mongocxx/private/search_index_view.hh | 3 -- src/mongocxx/lib/mongocxx/private/uri.hh | 3 -- .../lib/mongocxx/private/write_concern.hh | 3 -- .../mongocxx/v_noabi/mongocxx/bulk_write.cpp | 1 - .../v_noabi/mongocxx/change_stream.cpp | 1 - .../lib/mongocxx/v_noabi/mongocxx/client.cpp | 1 - .../v_noabi/mongocxx/client_encryption.cpp | 1 - .../v_noabi/mongocxx/client_session.cpp | 1 - .../mongocxx/v_noabi/mongocxx/collection.cpp | 1 - .../lib/mongocxx/v_noabi/mongocxx/cursor.cpp | 1 - .../mongocxx/v_noabi/mongocxx/database.cpp | 1 - .../mongocxx/events/command_failed_event.cpp | 1 - .../mongocxx/events/command_started_event.cpp | 1 - .../events/command_succeeded_event.cpp | 1 - .../events/heartbeat_failed_event.cpp | 1 - .../events/heartbeat_started_event.cpp | 1 - .../events/heartbeat_succeeded_event.cpp | 1 - .../mongocxx/events/server_changed_event.cpp | 1 - .../mongocxx/events/server_closed_event.cpp | 1 - .../mongocxx/events/server_description.cpp | 1 - .../mongocxx/events/server_opening_event.cpp | 1 - .../events/topology_changed_event.cpp | 1 - .../mongocxx/events/topology_closed_event.cpp | 1 - .../mongocxx/events/topology_description.cpp | 1 - .../events/topology_opening_event.cpp | 1 - .../v_noabi/mongocxx/exception/error_code.cpp | 2 -- .../exception/operation_exception.cpp | 1 - .../exception/private/mongoc_error.hh | 3 -- .../mongocxx/exception/server_error_code.cpp | 2 -- .../v_noabi/mongocxx/gridfs/bucket.cpp | 1 - .../v_noabi/mongocxx/gridfs/downloader.cpp | 1 - .../v_noabi/mongocxx/gridfs/private/bucket.hh | 4 --- .../mongocxx/gridfs/private/downloader.hh | 4 --- .../mongocxx/gridfs/private/uploader.hh | 4 --- .../v_noabi/mongocxx/gridfs/uploader.cpp | 2 -- .../lib/mongocxx/v_noabi/mongocxx/hint.cpp | 2 -- .../mongocxx/v_noabi/mongocxx/index_model.cpp | 2 -- .../mongocxx/v_noabi/mongocxx/index_view.cpp | 1 - .../mongocxx/v_noabi/mongocxx/instance.cpp | 1 - .../lib/mongocxx/v_noabi/mongocxx/logger.cpp | 2 -- .../v_noabi/mongocxx/model/delete_many.cpp | 2 -- .../v_noabi/mongocxx/model/delete_one.cpp | 2 -- .../v_noabi/mongocxx/model/insert_one.cpp | 2 -- .../v_noabi/mongocxx/model/replace_one.cpp | 2 -- .../v_noabi/mongocxx/model/update_many.cpp | 2 -- .../v_noabi/mongocxx/model/update_one.cpp | 2 -- .../mongocxx/v_noabi/mongocxx/model/write.cpp | 2 -- .../v_noabi/mongocxx/options/aggregate.cpp | 1 - .../mongocxx/v_noabi/mongocxx/options/apm.cpp | 2 -- .../mongocxx/options/auto_encryption.cpp | 1 - .../v_noabi/mongocxx/options/bulk_write.cpp | 2 -- .../mongocxx/options/change_stream.cpp | 2 -- .../v_noabi/mongocxx/options/client.cpp | 2 -- .../mongocxx/options/client_encryption.cpp | 1 - .../mongocxx/options/client_session.cpp | 2 -- .../v_noabi/mongocxx/options/count.cpp | 1 - .../v_noabi/mongocxx/options/delete.cpp | 2 -- .../v_noabi/mongocxx/options/distinct.cpp | 1 - .../v_noabi/mongocxx/options/encrypt.cpp | 1 - .../options/estimated_document_count.cpp | 1 - .../v_noabi/mongocxx/options/find.cpp | 1 - .../mongocxx/options/find_one_and_delete.cpp | 2 -- .../mongocxx/options/find_one_and_replace.cpp | 2 -- .../mongocxx/options/find_one_and_update.cpp | 2 -- .../mongocxx/options/gridfs/bucket.cpp | 2 -- .../mongocxx/options/gridfs/upload.cpp | 2 -- .../v_noabi/mongocxx/options/index.cpp | 1 - .../v_noabi/mongocxx/options/index_view.cpp | 2 -- .../v_noabi/mongocxx/options/insert.cpp | 2 -- .../v_noabi/mongocxx/options/pool.cpp | 2 -- .../v_noabi/mongocxx/options/private/apm.hh | 3 -- .../mongocxx/options/private/server_api.hh | 3 -- .../v_noabi/mongocxx/options/private/ssl.hh | 3 -- .../mongocxx/options/private/transaction.hh | 3 -- .../v_noabi/mongocxx/options/replace.cpp | 2 -- .../mongocxx/options/rewrap_many_datakey.cpp | 1 - .../v_noabi/mongocxx/options/server_api.cpp | 1 - .../mongocxx/v_noabi/mongocxx/options/tls.cpp | 2 -- .../v_noabi/mongocxx/options/transaction.cpp | 4 --- .../v_noabi/mongocxx/options/update.cpp | 2 -- .../mongocxx/v_noabi/mongocxx/pipeline.cpp | 1 - .../lib/mongocxx/v_noabi/mongocxx/pool.cpp | 1 - .../v_noabi/mongocxx/read_concern.cpp | 1 - .../v_noabi/mongocxx/read_preference.cpp | 1 - .../v_noabi/mongocxx/result/bulk_write.cpp | 2 -- .../v_noabi/mongocxx/result/delete.cpp | 2 -- .../v_noabi/mongocxx/result/gridfs/upload.cpp | 2 -- .../v_noabi/mongocxx/result/insert_many.cpp | 2 -- .../v_noabi/mongocxx/result/insert_one.cpp | 2 -- .../v_noabi/mongocxx/result/replace_one.cpp | 2 -- .../mongocxx/result/rewrap_many_datakey.cpp | 1 - .../v_noabi/mongocxx/result/update.cpp | 2 -- .../v_noabi/mongocxx/search_index_model.cpp | 1 - .../v_noabi/mongocxx/search_index_view.cpp | 1 - .../lib/mongocxx/v_noabi/mongocxx/uri.cpp | 1 - .../v_noabi/mongocxx/validation_criteria.cpp | 2 -- .../v_noabi/mongocxx/write_concern.cpp | 1 - src/mongocxx/test/catch_helpers.hh | 3 -- src/mongocxx/test/client.cpp | 1 - src/mongocxx/test/client_helpers.cpp | 1 - src/mongocxx/test/client_helpers.hh | 3 -- src/mongocxx/test/pool.cpp | 1 - src/mongocxx/test/spec/monitoring.cpp | 4 --- src/mongocxx/test/spec/monitoring.hh | 4 --- src/mongocxx/test/spec/operation.cpp | 4 --- src/mongocxx/test/spec/operation.hh | 3 -- .../test/spec/unified_tests/assert.hh | 4 --- .../test/spec/unified_tests/entity.hh | 4 --- .../test/spec/unified_tests/operations.hh | 4 --- src/mongocxx/test/spec/util.cpp | 4 --- src/mongocxx/test/spec/util.hh | 4 --- 168 files changed, 435 deletions(-) delete mode 100644 src/bsoncxx/lib/bsoncxx/private/config/postlude.hh delete mode 100644 src/bsoncxx/lib/bsoncxx/private/config/prelude.hh delete mode 100644 src/mongocxx/lib/mongocxx/private/config/postlude.hh delete mode 100644 src/mongocxx/lib/mongocxx/private/config/prelude.hh diff --git a/src/bsoncxx/lib/CMakeLists.txt b/src/bsoncxx/lib/CMakeLists.txt index c9cca6046b..4c8df16ca6 100644 --- a/src/bsoncxx/lib/CMakeLists.txt +++ b/src/bsoncxx/lib/CMakeLists.txt @@ -90,8 +90,6 @@ set_dist_list(src_bsoncxx_lib_DIST ${bsoncxx_sources_v1} bsoncxx/private/b64_ntop.hh bsoncxx/private/config/config.hh.in - bsoncxx/private/config/postlude.hh - bsoncxx/private/config/prelude.hh bsoncxx/private/export.hh bsoncxx/private/helpers.hh bsoncxx/private/itoa.hh diff --git a/src/bsoncxx/lib/bsoncxx/private/config/postlude.hh b/src/bsoncxx/lib/bsoncxx/private/config/postlude.hh deleted file mode 100644 index 0dfcfee59c..0000000000 --- a/src/bsoncxx/lib/bsoncxx/private/config/postlude.hh +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2009-present MongoDB, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// NOTE: Pop any macros here that are defined by the headers included -// in private/prelude.hpp. - -#include diff --git a/src/bsoncxx/lib/bsoncxx/private/config/prelude.hh b/src/bsoncxx/lib/bsoncxx/private/config/prelude.hh deleted file mode 100644 index bae02463d1..0000000000 --- a/src/bsoncxx/lib/bsoncxx/private/config/prelude.hh +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2009-present MongoDB, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include - -// NOTE: Push any macros here that are defined by the following -// headers here. - -#include diff --git a/src/bsoncxx/lib/bsoncxx/private/export.hh b/src/bsoncxx/lib/bsoncxx/private/export.hh index 75d040551d..698f92287b 100644 --- a/src/bsoncxx/lib/bsoncxx/private/export.hh +++ b/src/bsoncxx/lib/bsoncxx/private/export.hh @@ -14,10 +14,6 @@ #pragma once -#include - -#include - // The BSONCXX_TESTING macro is intended to be used for exporting symbols for testing which are not // normally exported as part of the bsoncxx library. We currently use this workaround in lieu of // linking standalone unit tests, in order to expose private symbols for unit testing when we build @@ -30,5 +26,3 @@ #define BSONCXX_ABI_EXPORT_TESTING #define BSONCXX_ABI_EXPORT_CDECL_TESTING(...) __VA_ARGS__ #endif - -#include diff --git a/src/bsoncxx/lib/bsoncxx/private/helpers.hh b/src/bsoncxx/lib/bsoncxx/private/helpers.hh index 1c78c95f37..9c5de9f32a 100644 --- a/src/bsoncxx/lib/bsoncxx/private/helpers.hh +++ b/src/bsoncxx/lib/bsoncxx/private/helpers.hh @@ -18,7 +18,6 @@ #include #include -#include #include namespace bsoncxx { @@ -47,5 +46,3 @@ inline bsoncxx::v_noabi::oid make_oid(bson_oid_t const* bson_oid) { } // namespace helpers } // namespace bsoncxx - -#include diff --git a/src/bsoncxx/lib/bsoncxx/private/itoa.cpp b/src/bsoncxx/lib/bsoncxx/private/itoa.cpp index e9e446850b..5feaa7e27c 100644 --- a/src/bsoncxx/lib/bsoncxx/private/itoa.cpp +++ b/src/bsoncxx/lib/bsoncxx/private/itoa.cpp @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include #include namespace bsoncxx { diff --git a/src/bsoncxx/lib/bsoncxx/private/itoa.hh b/src/bsoncxx/lib/bsoncxx/private/itoa.hh index 05f73f8768..92f2668471 100644 --- a/src/bsoncxx/lib/bsoncxx/private/itoa.hh +++ b/src/bsoncxx/lib/bsoncxx/private/itoa.hh @@ -17,7 +17,6 @@ #include #include -#include #include namespace bsoncxx { @@ -58,5 +57,3 @@ class itoa { }; } // namespace bsoncxx - -#include diff --git a/src/bsoncxx/lib/bsoncxx/private/stack.hh b/src/bsoncxx/lib/bsoncxx/private/stack.hh index b261e19b8d..e1f8c2f7b0 100644 --- a/src/bsoncxx/lib/bsoncxx/private/stack.hh +++ b/src/bsoncxx/lib/bsoncxx/private/stack.hh @@ -18,8 +18,6 @@ #include #include -#include - namespace bsoncxx { // Note: This stack is only intended for use with the 'frame' type in @@ -161,5 +159,3 @@ class stack { }; } // namespace bsoncxx - -#include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp index 4a071bc3da..058c9dbd65 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp @@ -17,8 +17,6 @@ #include #include -#include - namespace bsoncxx { namespace v_noabi { namespace array { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp index 57f20ecaf5..20e1202e2a 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp @@ -16,8 +16,6 @@ #include -#include - namespace bsoncxx { namespace v_noabi { namespace array { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp index 5dac785ea9..7de0d6047b 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp index 9855070530..95eadfbdaa 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp @@ -22,7 +22,6 @@ #include #include -#include #include #include #include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp index 870a64a64f..ed29b9f558 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp @@ -18,7 +18,6 @@ #include #include -#include #include namespace bsoncxx { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp index 6122248cdb..abed972017 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp @@ -22,7 +22,6 @@ #include #include -#include #include #include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp index d8873b1853..0a48995727 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp @@ -16,8 +16,6 @@ #include -#include - namespace bsoncxx { namespace v_noabi { namespace document { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp index f94d8ff11b..ce5d2ab6f7 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp @@ -18,7 +18,6 @@ #include #include -#include #include namespace bsoncxx { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp index 4d7904bda3..35f497cb3b 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp @@ -16,8 +16,6 @@ #include -#include - namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp index b67324ce5e..0d3cf87924 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp @@ -24,7 +24,6 @@ #include #include -#include #include namespace bsoncxx { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp index 64f6ab35ee..2b58615650 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp @@ -18,7 +18,6 @@ #include #include -#include #include namespace bsoncxx { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp index cc4a6e3034..60f1e4534a 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp @@ -15,8 +15,6 @@ #include #include -#include - namespace bsoncxx { namespace v_noabi { namespace string { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp index 54b3b6b501..9b06353a48 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp @@ -14,8 +14,6 @@ #include -#include - namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh index 0c4ce27848..f5fb3600e9 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh @@ -17,7 +17,6 @@ #include #include -#include #include namespace bsoncxx { @@ -64,5 +63,3 @@ inline bson_value::value make_owning_bson(void* internal_value) { } // namespace types } // namespace v_noabi } // namespace bsoncxx - -#include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp index 71aec0ff2d..af2d1f583f 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp @@ -18,7 +18,6 @@ #include #include -#include #include namespace bsoncxx { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp index 0b233d65fc..6219782b5d 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh index c77be8a8c1..20013871e9 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -326,5 +325,3 @@ inline void convert_from_libbson(bson_value_t const* v, b_array* out) { } // namespace types } // namespace v_noabi } // namespace bsoncxx - -#include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp index 640c416ae1..8532362ed7 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp @@ -14,7 +14,6 @@ #include -#include #include #include diff --git a/src/bsoncxx/test/catch.hh b/src/bsoncxx/test/catch.hh index 2ebd064c63..9a32fd6aa7 100644 --- a/src/bsoncxx/test/catch.hh +++ b/src/bsoncxx/test/catch.hh @@ -20,8 +20,6 @@ #include #include -#include - #include #include // TEST_CASE, SECTION, CHECK, etc. @@ -148,5 +146,3 @@ struct StringMaker { }; } // namespace Catch - -#include diff --git a/src/bsoncxx/test/exception_guard.hh b/src/bsoncxx/test/exception_guard.hh index f922413c73..b090572419 100644 --- a/src/bsoncxx/test/exception_guard.hh +++ b/src/bsoncxx/test/exception_guard.hh @@ -23,8 +23,6 @@ #include -#include - #include namespace bsoncxx { @@ -101,5 +99,3 @@ struct exception_guard_state { } // namespace test } // namespace bsoncxx - -#include diff --git a/src/bsoncxx/test/to_string.hh b/src/bsoncxx/test/to_string.hh index eb600ce7d3..0cdf5ccb20 100644 --- a/src/bsoncxx/test/to_string.hh +++ b/src/bsoncxx/test/to_string.hh @@ -26,8 +26,6 @@ #include #include -#include - namespace bsoncxx { inline std::string to_string(bsoncxx::v_noabi::types::bson_value::view_or_value val) { @@ -92,5 +90,3 @@ inline std::string to_string(bsoncxx::v_noabi::types::bson_value::view_or_value } } // namespace bsoncxx - -#include diff --git a/src/mongocxx/lib/CMakeLists.txt b/src/mongocxx/lib/CMakeLists.txt index 7b71a266f0..10cddac32c 100644 --- a/src/mongocxx/lib/CMakeLists.txt +++ b/src/mongocxx/lib/CMakeLists.txt @@ -189,8 +189,6 @@ set_dist_list(src_mongocxx_lib_DIST mongocxx/private/client.hh mongocxx/private/collection.hh mongocxx/private/config/config.hh.in - mongocxx/private/config/postlude.hh - mongocxx/private/config/prelude.hh mongocxx/private/conversions.hh mongocxx/private/cursor.hh mongocxx/private/database.hh diff --git a/src/mongocxx/lib/mongocxx/private/append_aggregate_options.hh b/src/mongocxx/lib/mongocxx/private/append_aggregate_options.hh index a1dbb54108..a8320e3d1a 100644 --- a/src/mongocxx/lib/mongocxx/private/append_aggregate_options.hh +++ b/src/mongocxx/lib/mongocxx/private/append_aggregate_options.hh @@ -4,8 +4,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { @@ -56,5 +54,3 @@ inline void append_aggregate_options( } } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/bulk_write.hh b/src/mongocxx/lib/mongocxx/private/bulk_write.hh index 5a34fddaa8..296d520721 100644 --- a/src/mongocxx/lib/mongocxx/private/bulk_write.hh +++ b/src/mongocxx/lib/mongocxx/private/bulk_write.hh @@ -16,7 +16,6 @@ #include -#include #include namespace mongocxx { @@ -42,5 +41,3 @@ class bulk_write::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/change_stream.hh b/src/mongocxx/lib/mongocxx/private/change_stream.hh index 68129fb268..5ea373f708 100644 --- a/src/mongocxx/lib/mongocxx/private/change_stream.hh +++ b/src/mongocxx/lib/mongocxx/private/change_stream.hh @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -122,5 +121,3 @@ class change_stream::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/client.hh b/src/mongocxx/lib/mongocxx/private/client.hh index b2c21eafee..47f59372d6 100644 --- a/src/mongocxx/lib/mongocxx/private/client.hh +++ b/src/mongocxx/lib/mongocxx/private/client.hh @@ -18,7 +18,6 @@ #include -#include #include #include @@ -46,5 +45,3 @@ class client::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/client_encryption.hh b/src/mongocxx/lib/mongocxx/private/client_encryption.hh index d23f7e2d9a..a79ed7c5d2 100644 --- a/src/mongocxx/lib/mongocxx/private/client_encryption.hh +++ b/src/mongocxx/lib/mongocxx/private/client_encryption.hh @@ -33,7 +33,6 @@ #include #include -#include #include #include #include @@ -364,5 +363,3 @@ class client_encryption::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/client_session.hh b/src/mongocxx/lib/mongocxx/private/client_session.hh index e374156f36..c25c6501b4 100644 --- a/src/mongocxx/lib/mongocxx/private/client_session.hh +++ b/src/mongocxx/lib/mongocxx/private/client_session.hh @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -241,5 +240,3 @@ class client_session::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/collection.hh b/src/mongocxx/lib/mongocxx/private/collection.hh index 491df6aabe..efba8acbae 100644 --- a/src/mongocxx/lib/mongocxx/private/collection.hh +++ b/src/mongocxx/lib/mongocxx/private/collection.hh @@ -22,7 +22,6 @@ #include -#include #include #include #include @@ -67,5 +66,3 @@ class collection::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/config/postlude.hh b/src/mongocxx/lib/mongocxx/private/config/postlude.hh deleted file mode 100644 index 060636a649..0000000000 --- a/src/mongocxx/lib/mongocxx/private/config/postlude.hh +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2009-present MongoDB, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// NOTE: Pop any macros here that are defined by the headers included -// in private/prelude.hpp. - -// config.hh (generated by CMake) -#undef MONGOCXX_ENABLE_SSL -#pragma pop_macro("MONGOCXX_ENABLE_SSL") -#undef MONGOCXX_COMPILER_ID -#pragma pop_macro("MONGOCXX_COMPILER_ID") -#undef MONGOCXX_COMPILER_VERSION -#pragma pop_macro("MONGOCXX_COMPILER_VERSION") - -#include diff --git a/src/mongocxx/lib/mongocxx/private/config/prelude.hh b/src/mongocxx/lib/mongocxx/private/config/prelude.hh deleted file mode 100644 index 0cddf0e046..0000000000 --- a/src/mongocxx/lib/mongocxx/private/config/prelude.hh +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2009-present MongoDB, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include - -// NOTE: Push any macros here that are defined by the following -// headers here. - -// config.hh (generated by CMake) -#pragma push_macro("MONGOCXX_ENABLE_SSL") -#undef MONGOCXX_ENABLE_SSL -#pragma push_macro("MONGOCXX_COMPILER_ID") -#undef MONGOCXX_COMPILER_ID -#pragma push_macro("MONGOCXX_COMPILER_VERSION") -#undef MONGOCXX_COMPILER_VERSION - -#include diff --git a/src/mongocxx/lib/mongocxx/private/conversions.cpp b/src/mongocxx/lib/mongocxx/private/conversions.cpp index b9da12f22c..d00e5f5035 100644 --- a/src/mongocxx/lib/mongocxx/private/conversions.cpp +++ b/src/mongocxx/lib/mongocxx/private/conversions.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/private/conversions.hh b/src/mongocxx/lib/mongocxx/private/conversions.hh index acf4d26851..8b38865750 100644 --- a/src/mongocxx/lib/mongocxx/private/conversions.hh +++ b/src/mongocxx/lib/mongocxx/private/conversions.hh @@ -16,7 +16,6 @@ #include -#include #include #include @@ -33,5 +32,3 @@ read_mode_from_read_mode_t(mongoc_read_mode_t read_mode); } // namespace conversions } // namespace libmongoc } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/cursor.hh b/src/mongocxx/lib/mongocxx/private/cursor.hh index 26a36bba94..ce0a7c2445 100644 --- a/src/mongocxx/lib/mongocxx/private/cursor.hh +++ b/src/mongocxx/lib/mongocxx/private/cursor.hh @@ -19,7 +19,6 @@ #include -#include #include namespace mongocxx { @@ -91,5 +90,3 @@ class cursor::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/database.hh b/src/mongocxx/lib/mongocxx/private/database.hh index bc93d77589..05e44a7bc5 100644 --- a/src/mongocxx/lib/mongocxx/private/database.hh +++ b/src/mongocxx/lib/mongocxx/private/database.hh @@ -18,7 +18,6 @@ #include #include -#include #include #include @@ -55,5 +54,3 @@ class database::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/export.hh b/src/mongocxx/lib/mongocxx/private/export.hh index a19ab84263..0224992959 100644 --- a/src/mongocxx/lib/mongocxx/private/export.hh +++ b/src/mongocxx/lib/mongocxx/private/export.hh @@ -14,10 +14,6 @@ #pragma once -#include - -#include - // See src/bsoncxx/lib/bsoncxx/private/export.hh for an explanation of // the purpose of this header. @@ -28,5 +24,3 @@ #define MONGOCXX_ABI_EXPORT_TESTING #define MONGOCXX_ABI_EXPORT_CDECL_TESTING(...) __VA_ARGS__ #endif - -#include diff --git a/src/mongocxx/lib/mongocxx/private/index_view.hh b/src/mongocxx/lib/mongocxx/private/index_view.hh index f8e98228ef..d013d5614a 100644 --- a/src/mongocxx/lib/mongocxx/private/index_view.hh +++ b/src/mongocxx/lib/mongocxx/private/index_view.hh @@ -30,7 +30,6 @@ #include #include -#include #include #include @@ -276,5 +275,3 @@ class index_view::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/libbson.cpp b/src/mongocxx/lib/mongocxx/private/libbson.cpp index fd7a4eb85c..22ace2f2cf 100644 --- a/src/mongocxx/lib/mongocxx/private/libbson.cpp +++ b/src/mongocxx/lib/mongocxx/private/libbson.cpp @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/private/libbson.hh b/src/mongocxx/lib/mongocxx/private/libbson.hh index 4a7b8d7426..eda44e373a 100644 --- a/src/mongocxx/lib/mongocxx/private/libbson.hh +++ b/src/mongocxx/lib/mongocxx/private/libbson.hh @@ -21,7 +21,6 @@ #include -#include #include namespace mongocxx { @@ -161,5 +160,3 @@ class scoped_bson_t { } // namespace libbson } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/libmongoc.cpp b/src/mongocxx/lib/mongocxx/private/libmongoc.cpp index b51fe2a324..f21a0d9010 100644 --- a/src/mongocxx/lib/mongocxx/private/libmongoc.cpp +++ b/src/mongocxx/lib/mongocxx/private/libmongoc.cpp @@ -14,8 +14,6 @@ #include "libmongoc.hh" -#include - namespace mongocxx { namespace libmongoc { diff --git a/src/mongocxx/lib/mongocxx/private/libmongoc.hh b/src/mongocxx/lib/mongocxx/private/libmongoc.hh index 037d4b6f7d..5548a1758e 100644 --- a/src/mongocxx/lib/mongocxx/private/libmongoc.hh +++ b/src/mongocxx/lib/mongocxx/private/libmongoc.hh @@ -34,7 +34,6 @@ // TODO: CXX-1366 Disable MSVC warnings for libmongoc #endif -#include #include #include @@ -82,5 +81,3 @@ constexpr auto log_set_handler = mongoc_log_set_handler; } // namespace libmongoc } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/mock.hh b/src/mongocxx/lib/mongocxx/private/mock.hh index 7fa69c505b..e584ef0bad 100644 --- a/src/mongocxx/lib/mongocxx/private/mock.hh +++ b/src/mongocxx/lib/mongocxx/private/mock.hh @@ -28,8 +28,6 @@ #include -#include - namespace mongocxx { namespace test_util { @@ -187,5 +185,3 @@ class mock { } // namespace test_util } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/numeric_casting.cpp b/src/mongocxx/lib/mongocxx/private/numeric_casting.cpp index fd35a45641..806aecb63f 100644 --- a/src/mongocxx/lib/mongocxx/private/numeric_casting.cpp +++ b/src/mongocxx/lib/mongocxx/private/numeric_casting.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/private/numeric_casting.hh b/src/mongocxx/lib/mongocxx/private/numeric_casting.hh index a5daecdc57..54f1665a7a 100644 --- a/src/mongocxx/lib/mongocxx/private/numeric_casting.hh +++ b/src/mongocxx/lib/mongocxx/private/numeric_casting.hh @@ -17,7 +17,6 @@ #include #include -#include #include namespace mongocxx { @@ -43,5 +42,3 @@ MONGOCXX_ABI_EXPORT_CDECL_TESTING(bool) int32_to_size_t_safe(int32_t const in, s MONGOCXX_ABI_EXPORT_CDECL_TESTING(bool) int64_to_size_t_safe(int64_t const in, std::size_t& out); } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/pipeline.hh b/src/mongocxx/lib/mongocxx/private/pipeline.hh index 75dd51ca47..38cfe19659 100644 --- a/src/mongocxx/lib/mongocxx/private/pipeline.hh +++ b/src/mongocxx/lib/mongocxx/private/pipeline.hh @@ -18,8 +18,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { @@ -46,5 +44,3 @@ class pipeline::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/pool.hh b/src/mongocxx/lib/mongocxx/private/pool.hh index 9bd130bafa..f785de9f0b 100644 --- a/src/mongocxx/lib/mongocxx/private/pool.hh +++ b/src/mongocxx/lib/mongocxx/private/pool.hh @@ -19,7 +19,6 @@ #include -#include #include namespace mongocxx { @@ -46,5 +45,3 @@ class pool::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/read_concern.hh b/src/mongocxx/lib/mongocxx/private/read_concern.hh index 762ebc9c00..8849b01868 100644 --- a/src/mongocxx/lib/mongocxx/private/read_concern.hh +++ b/src/mongocxx/lib/mongocxx/private/read_concern.hh @@ -16,7 +16,6 @@ #include -#include #include namespace mongocxx { @@ -41,5 +40,3 @@ class read_concern::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/read_preference.hh b/src/mongocxx/lib/mongocxx/private/read_preference.hh index d0f7437cba..76cd484c52 100644 --- a/src/mongocxx/lib/mongocxx/private/read_preference.hh +++ b/src/mongocxx/lib/mongocxx/private/read_preference.hh @@ -16,7 +16,6 @@ #include -#include #include namespace mongocxx { @@ -41,5 +40,3 @@ class read_preference::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/search_index_model.hh b/src/mongocxx/lib/mongocxx/private/search_index_model.hh index 0d1e4ce445..331ffd2f11 100644 --- a/src/mongocxx/lib/mongocxx/private/search_index_model.hh +++ b/src/mongocxx/lib/mongocxx/private/search_index_model.hh @@ -4,8 +4,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { @@ -22,5 +20,3 @@ class search_index_model::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/search_index_view.hh b/src/mongocxx/lib/mongocxx/private/search_index_view.hh index f9c28f09fd..f0ba91a46b 100644 --- a/src/mongocxx/lib/mongocxx/private/search_index_view.hh +++ b/src/mongocxx/lib/mongocxx/private/search_index_view.hh @@ -11,7 +11,6 @@ #include #include -#include #include #include @@ -205,5 +204,3 @@ class search_index_view::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/uri.hh b/src/mongocxx/lib/mongocxx/private/uri.hh index 22619bcb1f..19263040db 100644 --- a/src/mongocxx/lib/mongocxx/private/uri.hh +++ b/src/mongocxx/lib/mongocxx/private/uri.hh @@ -16,7 +16,6 @@ #include -#include #include namespace mongocxx { @@ -37,5 +36,3 @@ class uri::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/private/write_concern.hh b/src/mongocxx/lib/mongocxx/private/write_concern.hh index 53377d11f6..b4bacfe403 100644 --- a/src/mongocxx/lib/mongocxx/private/write_concern.hh +++ b/src/mongocxx/lib/mongocxx/private/write_concern.hh @@ -16,7 +16,6 @@ #include -#include #include namespace mongocxx { @@ -41,5 +40,3 @@ class write_concern::impl { } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp index 339062adc2..bc38325b41 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp index bc0b53d742..0077fedffd 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp @@ -19,7 +19,6 @@ #include #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp index 4d3df46796..db7c8b3043 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp @@ -28,7 +28,6 @@ #include #include -#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp index 24c53b7540..6798f99c1d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp @@ -17,7 +17,6 @@ #include #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp index 026784dd3c..39b83edd1d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp @@ -19,7 +19,6 @@ #include #include -#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp index 56668e191f..c02a3f6bee 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp index a1962ff37d..76150dcccf 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp index c6ad181477..497605cae7 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp @@ -30,7 +30,6 @@ #include #include -#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp index 481df2fafe..c6b9c03abc 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp @@ -21,7 +21,6 @@ #include #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp index 4b5edd317c..c6b9523287 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp @@ -17,7 +17,6 @@ #include #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp index eb8c7f8f46..58dac17546 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp @@ -17,7 +17,6 @@ #include #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp index f7e452ef40..82589a6c64 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp index cf1a60a5fe..b251fb0e33 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp index 3d2b96ecba..88601d5220 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp index c3c30893b6..e41a5898e7 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp index d7ec0a4d24..5ec08cfe6e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp index 1c7a713166..23b35f9075 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp index 3b837469b6..628897bc60 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp index c350028d87..9d96c5d9b8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp index 9945c2bf0c..3c1d013dba 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp index 025c0945f6..4e410e7d58 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp @@ -14,7 +14,6 @@ #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp index 774c71f3b0..1ef3605cdf 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp index a77b57418d..9631db7333 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp @@ -16,8 +16,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp index c395747418..bd6a7d7e7e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp @@ -19,7 +19,6 @@ #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh index cd772b8bd4..c970c22c92 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh @@ -19,7 +19,6 @@ #include #include -#include #include namespace mongocxx { @@ -64,5 +63,3 @@ void throw_exception(bsoncxx::v_noabi::document::value raw_server_error, ::bson_ } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp index 6e8baa63bf..b53efa88bf 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp @@ -16,8 +16,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp index 371d3eb258..65915362e5 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp @@ -34,7 +34,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp index 0b83449e02..630b3e06ee 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp @@ -26,7 +26,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh index 531babd964..55521e83c1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh @@ -20,8 +20,6 @@ #include #include -#include - namespace mongocxx { namespace v_noabi { namespace gridfs { @@ -54,5 +52,3 @@ class bucket::impl { } // namespace gridfs } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh index 0e856a980b..52d30483ab 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh @@ -21,8 +21,6 @@ #include #include -#include - namespace mongocxx { namespace v_noabi { namespace gridfs { @@ -116,5 +114,3 @@ class downloader::impl { } // namespace gridfs } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh index 1f04bc4081..3adfff3c3f 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh @@ -23,8 +23,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace gridfs { @@ -91,5 +89,3 @@ class uploader::impl { } // namespace gridfs } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp index 658f8b9df6..1e59b991dd 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp @@ -27,8 +27,6 @@ #include #include -#include - namespace { std::size_t chunks_collection_documents_max_length(std::size_t chunk_size) { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp index 67fca5358d..ec0d2e99e3 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp @@ -18,8 +18,6 @@ #include -#include - using bsoncxx::v_noabi::builder::concatenate; using bsoncxx::v_noabi::builder::basic::kvp; using bsoncxx::v_noabi::builder::basic::sub_document; diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp index b899925e22..9b91f3effd 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp index 434ea14cbb..d611166bf8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp @@ -21,7 +21,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp index eeb9f9f86a..344337d8be 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp @@ -26,7 +26,6 @@ #include -#include #include #if !defined(__has_feature) diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp index 715d243ffd..69fbc72912 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp index d719fbb624..bae9ec2a88 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace model { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp index d969e8b6e8..fa7a975a95 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace model { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp index dcc2c849d8..35279ec55b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace model { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp index 98f2eb185b..40757bfb22 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace model { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp index 51fc548670..3d83849f2e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp @@ -16,8 +16,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace model { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp index b69144ede6..8721dd9425 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp @@ -16,8 +16,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace model { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp index b4dbee3e14..d2f08f81e8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp @@ -16,8 +16,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace model { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp index 24fdfb2239..a5f8b61b0a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp @@ -17,7 +17,6 @@ #include #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp index 33bbe96257..ca4be3350d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp index eed07082a1..4c919f3c98 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp index 6f46732a53..5596a055ca 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp index 2eb65f5710..795f0832e2 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp @@ -22,8 +22,6 @@ #include #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp index 517b3ebe82..4b08ea0aa7 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp index 84cd7da3d4..598c7f1509 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp @@ -16,7 +16,6 @@ #include #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp index 9065fff6f1..cf3b389ac3 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp index 50d5c504f9..ac41f7fdc2 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp index 6a2d068c1a..4f91f62af6 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp @@ -15,8 +15,6 @@ #include #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp index bdfaa7faab..1ce5e96fbe 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp index 04b0c782c3..0969ebf4f2 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp index e0adf00af0..91099b72a9 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp index 368ed52464..08f0f701e3 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp index 50a50f7a2a..6c77cf335e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp index c387e29ea1..2df73ab09a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp index 0da05986ca..a1c4b9021e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp @@ -16,8 +16,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp index 8a806772a2..7d46423d7f 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp @@ -19,8 +19,6 @@ #include #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp index 5f877e66b1..00bf952a55 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp @@ -16,8 +16,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp index 9ae8fdd0fb..424ff53201 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp @@ -20,7 +20,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp index 4127ab9590..2d4bf8aa1a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp @@ -18,8 +18,6 @@ #include -#include - using bsoncxx::v_noabi::builder::basic::kvp; using bsoncxx::v_noabi::builder::basic::make_document; diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp index 77aab15725..47454b0a83 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp index 2df55ce1c5..04c68f2d25 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh index e2104a4431..f0c6dbd24d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh @@ -18,7 +18,6 @@ #include -#include #include namespace mongocxx { @@ -168,5 +167,3 @@ inline apm_unique_callbacks make_apm_callbacks(apm const& apm_opts) { } // namespace options } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh index 42f311a29d..7507522c76 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh @@ -19,7 +19,6 @@ #include #include -#include #include namespace mongocxx { @@ -59,5 +58,3 @@ inline unique_server_api make_server_api(server_api const& opts) { } // namespace options } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh index bb72cf4fc9..0ccfd17eb3 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh @@ -18,7 +18,6 @@ #include -#include #include namespace mongocxx { @@ -56,5 +55,3 @@ inline std::pair<::mongoc_ssl_opt_t, std::list diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh index 1784a53b92..a08c717ffc 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh @@ -19,7 +19,6 @@ #include -#include #include #include #include @@ -129,5 +128,3 @@ class transaction::impl { } // namespace options } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp index 86ce6b0a7a..5a42d66884 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp @@ -16,8 +16,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp index 85326b7fed..c219b49449 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp @@ -18,7 +18,6 @@ #include #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp index fd8b9bb180..28514b5f56 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp @@ -20,7 +20,6 @@ #include #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp index a641fb3259..93050ba343 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp index 0af76c51ad..5379d65dd3 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp @@ -18,8 +18,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { @@ -90,5 +88,3 @@ transaction::impl& transaction::_get_impl() { } // namespace options } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp index c3103f2025..2d7deeee8c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp @@ -17,8 +17,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp index 1bd06bb27b..83551aa913 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp @@ -19,7 +19,6 @@ #include -#include #include using bsoncxx::v_noabi::builder::basic::kvp; diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp index 1053c64677..c014faefb5 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp @@ -27,7 +27,6 @@ #include #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp index 1d349e1793..dc50377f95 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp @@ -21,7 +21,6 @@ #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp index 8eda311681..f5b6c09166 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp @@ -20,7 +20,6 @@ #include -#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp index 8b8383976d..60363ac87d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace result { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp index acba6e8598..96e0aaa7a1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace result { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp index 0fb9042a18..c44f1088c3 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp @@ -16,8 +16,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace result { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp index 1590ecb452..abd0693a64 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp @@ -16,8 +16,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace result { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp index fc880db56c..8db2abaafa 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp @@ -16,8 +16,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace result { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp index f918708670..2a3a098690 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace result { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp index 96507fa04c..d4af1552b1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp @@ -15,7 +15,6 @@ #include #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp index 0ba802326e..f60790bc48 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace result { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp index 9f0b30dd31..ea02fe5309 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp @@ -4,7 +4,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp index da1db484db..9c66a708f2 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp @@ -4,7 +4,6 @@ #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp index 12b09f701f..3889ff4e0d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp @@ -20,7 +20,6 @@ #include -#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp index b4b536ef03..cd9171fa2e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp @@ -20,8 +20,6 @@ #include -#include - namespace { using bsoncxx::v_noabi::builder::basic::kvp; diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp index bfd995e5f1..a981e5c24e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp @@ -24,7 +24,6 @@ #include -#include #include #include diff --git a/src/mongocxx/test/catch_helpers.hh b/src/mongocxx/test/catch_helpers.hh index 5ba4879b8a..1bb70e0921 100644 --- a/src/mongocxx/test/catch_helpers.hh +++ b/src/mongocxx/test/catch_helpers.hh @@ -16,7 +16,6 @@ #include -#include #include #include @@ -257,5 +256,3 @@ class mongocxx_exception_matcher : public Catch::Matchers::MatcherBase diff --git a/src/mongocxx/test/client.cpp b/src/mongocxx/test/client.cpp index 89f17a8bd5..642124b4de 100644 --- a/src/mongocxx/test/client.cpp +++ b/src/mongocxx/test/client.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include diff --git a/src/mongocxx/test/client_helpers.cpp b/src/mongocxx/test/client_helpers.cpp index ebf40e8d5a..65fd5ee1d3 100644 --- a/src/mongocxx/test/client_helpers.cpp +++ b/src/mongocxx/test/client_helpers.cpp @@ -36,7 +36,6 @@ #include #include -#include #include #include diff --git a/src/mongocxx/test/client_helpers.hh b/src/mongocxx/test/client_helpers.hh index 624562997b..677142906d 100644 --- a/src/mongocxx/test/client_helpers.hh +++ b/src/mongocxx/test/client_helpers.hh @@ -32,7 +32,6 @@ #include #include -#include #include #include @@ -249,5 +248,3 @@ std::string getenv_or_fail(const std::string env_name); } // namespace test_util } // namespace mongocxx - -#include diff --git a/src/mongocxx/test/pool.cpp b/src/mongocxx/test/pool.cpp index a7aa60098b..ced3e51353 100644 --- a/src/mongocxx/test/pool.cpp +++ b/src/mongocxx/test/pool.cpp @@ -21,7 +21,6 @@ #include #include -#include #include #include diff --git a/src/mongocxx/test/spec/monitoring.cpp b/src/mongocxx/test/spec/monitoring.cpp index acdbbb65fd..d00bddb8da 100644 --- a/src/mongocxx/test/spec/monitoring.cpp +++ b/src/mongocxx/test/spec/monitoring.cpp @@ -20,8 +20,6 @@ #include -#include - #include #include @@ -356,5 +354,3 @@ void apm_checker::clear() { } // namespace spec } // namespace mongocxx - -#include diff --git a/src/mongocxx/test/spec/monitoring.hh b/src/mongocxx/test/spec/monitoring.hh index b7a2ece458..d522dfe90a 100644 --- a/src/mongocxx/test/spec/monitoring.hh +++ b/src/mongocxx/test/spec/monitoring.hh @@ -16,8 +16,6 @@ #include -#include - #include #include @@ -87,5 +85,3 @@ class apm_checker { } // namespace spec } // namespace mongocxx - -#include diff --git a/src/mongocxx/test/spec/operation.cpp b/src/mongocxx/test/spec/operation.cpp index 5a4837182b..3abd91f4a4 100644 --- a/src/mongocxx/test/spec/operation.cpp +++ b/src/mongocxx/test/spec/operation.cpp @@ -41,8 +41,6 @@ #include #include -#include - #include #include @@ -1579,5 +1577,3 @@ document::value operation_runner::run(document::view operation) { } // namespace spec } // namespace mongocxx - -#include diff --git a/src/mongocxx/test/spec/operation.hh b/src/mongocxx/test/spec/operation.hh index 11ae36c569..313ddc5c77 100644 --- a/src/mongocxx/test/spec/operation.hh +++ b/src/mongocxx/test/spec/operation.hh @@ -23,7 +23,6 @@ #include #include -#include #include namespace mongocxx { @@ -87,5 +86,3 @@ class operation_runner { } // namespace spec } // namespace mongocxx - -#include diff --git a/src/mongocxx/test/spec/unified_tests/assert.hh b/src/mongocxx/test/spec/unified_tests/assert.hh index 6f4394f42c..852bf0a9cc 100644 --- a/src/mongocxx/test/spec/unified_tests/assert.hh +++ b/src/mongocxx/test/spec/unified_tests/assert.hh @@ -18,8 +18,6 @@ #include -#include - namespace mongocxx { namespace assert { @@ -32,5 +30,3 @@ void matches( } // namespace assert } // namespace mongocxx - -#include diff --git a/src/mongocxx/test/spec/unified_tests/entity.hh b/src/mongocxx/test/spec/unified_tests/entity.hh index a25a11b6d4..60ab5b9225 100644 --- a/src/mongocxx/test/spec/unified_tests/entity.hh +++ b/src/mongocxx/test/spec/unified_tests/entity.hh @@ -22,8 +22,6 @@ #include #include -#include - namespace mongocxx { namespace entity { @@ -89,5 +87,3 @@ class map { } // namespace entity } // namespace mongocxx - -#include diff --git a/src/mongocxx/test/spec/unified_tests/operations.hh b/src/mongocxx/test/spec/unified_tests/operations.hh index f39a74b1b5..a61df341c5 100644 --- a/src/mongocxx/test/spec/unified_tests/operations.hh +++ b/src/mongocxx/test/spec/unified_tests/operations.hh @@ -22,8 +22,6 @@ #include #include -#include - #include namespace mongocxx { @@ -46,5 +44,3 @@ bsoncxx::stdx::optional lookup_read_preference(bsoncxx::documen } // namespace operations } // namespace mongocxx - -#include diff --git a/src/mongocxx/test/spec/util.cpp b/src/mongocxx/test/spec/util.cpp index 3f32c9830f..356b7301d9 100644 --- a/src/mongocxx/test/spec/util.cpp +++ b/src/mongocxx/test/spec/util.cpp @@ -41,8 +41,6 @@ #include #include -#include - #include #include @@ -1120,5 +1118,3 @@ void run_crud_tests_in_file(std::string const& test_path, uri test_uri) { } // namespace spec } // namespace mongocxx - -#include diff --git a/src/mongocxx/test/spec/util.hh b/src/mongocxx/test/spec/util.hh index c453d3f64e..1e9cd15218 100644 --- a/src/mongocxx/test/spec/util.hh +++ b/src/mongocxx/test/spec/util.hh @@ -23,8 +23,6 @@ #include #include -#include - #include namespace mongocxx { @@ -126,5 +124,3 @@ void run_crud_tests_in_file(std::string const& test_path, uri test_uri = uri{}); } // namespace spec } // namespace mongocxx - -#include From dc9cd5c67ebb8177379c3f191c75bc86617f555c Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 16 Jan 2025 10:19:22 -0600 Subject: [PATCH 07/22] Address missing include directives --- src/bsoncxx/lib/bsoncxx/private/b64_ntop.hh | 4 ---- src/bsoncxx/lib/bsoncxx/private/export.hh | 2 ++ src/bsoncxx/lib/bsoncxx/private/make_unique.hh | 6 ++---- .../lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp | 7 ++++++- src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp | 6 ++++++ .../lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh | 2 ++ src/bsoncxx/test/catch.cpp | 4 ++-- src/bsoncxx/test/catch.hh | 2 ++ src/bsoncxx/test/optional.test.cpp | 2 -- src/bsoncxx/test/string_view.test.cpp | 2 -- src/bsoncxx/test/type_traits.test.cpp | 2 -- src/mongocxx/lib/mongocxx/private/export.hh | 2 ++ src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp | 2 ++ src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp | 4 ++++ .../lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp | 2 -- .../lib/mongocxx/v_noabi/mongocxx/options/index.cpp | 2 -- .../lib/mongocxx/v_noabi/mongocxx/options/range.cpp | 2 -- src/mongocxx/test/catch.cpp | 2 +- src/mongocxx/test/client.cpp | 7 ++++++- src/mongocxx/test/client_helpers.cpp | 3 +-- src/mongocxx/test/client_side_encryption.cpp | 2 -- src/mongocxx/test/spec/unified_tests/assert.cpp | 6 ++++-- src/mongocxx/test/spec/unified_tests/entity.cpp | 2 -- src/mongocxx/test/spec/unified_tests/operations.cpp | 2 -- 24 files changed, 42 insertions(+), 35 deletions(-) diff --git a/src/bsoncxx/lib/bsoncxx/private/b64_ntop.hh b/src/bsoncxx/lib/bsoncxx/private/b64_ntop.hh index e902e23e19..a3a8e6ec3c 100644 --- a/src/bsoncxx/lib/bsoncxx/private/b64_ntop.hh +++ b/src/bsoncxx/lib/bsoncxx/private/b64_ntop.hh @@ -45,8 +45,6 @@ #include #include -#include - namespace bsoncxx { namespace b64 { @@ -187,5 +185,3 @@ inline int ntop(std::uint8_t const* src, std::size_t srclength, char* target, st } // namespace b64 } // namespace bsoncxx - -#include diff --git a/src/bsoncxx/lib/bsoncxx/private/export.hh b/src/bsoncxx/lib/bsoncxx/private/export.hh index 698f92287b..26c729ee78 100644 --- a/src/bsoncxx/lib/bsoncxx/private/export.hh +++ b/src/bsoncxx/lib/bsoncxx/private/export.hh @@ -14,6 +14,8 @@ #pragma once +#include + // The BSONCXX_TESTING macro is intended to be used for exporting symbols for testing which are not // normally exported as part of the bsoncxx library. We currently use this workaround in lieu of // linking standalone unit tests, in order to expose private symbols for unit testing when we build diff --git a/src/bsoncxx/lib/bsoncxx/private/make_unique.hh b/src/bsoncxx/lib/bsoncxx/private/make_unique.hh index e3b6927e1a..c9f66ecbf3 100644 --- a/src/bsoncxx/lib/bsoncxx/private/make_unique.hh +++ b/src/bsoncxx/lib/bsoncxx/private/make_unique.hh @@ -14,9 +14,9 @@ #pragma once -#include +#include -#include +#include #pragma push_macro("BSONCXX_DETAIL_USE_STD_MAKE_UNIQUE") #undef BSONCXX_DETAIL_USE_STD_MAKE_UNIQUE @@ -168,5 +168,3 @@ std::unique_ptr make_unique_for_overwrite(std::size_t count) { } // namespace bsoncxx #pragma pop_macro("BSONCXX_DETAIL_USE_STD_MAKE_UNIQUE") - -#include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp index abed972017..d9f9b62236 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp @@ -12,10 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + +// + +#include + #include #include -#include #include #include #include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp index 0d3cf87924..5b921cac31 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp @@ -12,6 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + +// + +#include + #include #include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh index 20013871e9..ac254f08f0 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh @@ -14,6 +14,8 @@ #pragma once +#include + #include #include diff --git a/src/bsoncxx/test/catch.cpp b/src/bsoncxx/test/catch.cpp index ac914c5fc9..bd77ed0783 100644 --- a/src/bsoncxx/test/catch.cpp +++ b/src/bsoncxx/test/catch.cpp @@ -16,9 +16,9 @@ // -#include +#include -#include +#include #include diff --git a/src/bsoncxx/test/catch.hh b/src/bsoncxx/test/catch.hh index 9a32fd6aa7..fbc5b2761d 100644 --- a/src/bsoncxx/test/catch.hh +++ b/src/bsoncxx/test/catch.hh @@ -14,6 +14,8 @@ #pragma once +#include + #include #include #include diff --git a/src/bsoncxx/test/optional.test.cpp b/src/bsoncxx/test/optional.test.cpp index a70d89305d..70e0fddbdb 100644 --- a/src/bsoncxx/test/optional.test.cpp +++ b/src/bsoncxx/test/optional.test.cpp @@ -12,8 +12,6 @@ #include -#include - #include // Each polyfill library has some set of features that are not conformant with the standard diff --git a/src/bsoncxx/test/string_view.test.cpp b/src/bsoncxx/test/string_view.test.cpp index 69b87ad410..4b5aebaff4 100644 --- a/src/bsoncxx/test/string_view.test.cpp +++ b/src/bsoncxx/test/string_view.test.cpp @@ -18,8 +18,6 @@ #include #include -#include - #include namespace stdx = bsoncxx::stdx; diff --git a/src/bsoncxx/test/type_traits.test.cpp b/src/bsoncxx/test/type_traits.test.cpp index dae83f62ec..7152aa5de8 100644 --- a/src/bsoncxx/test/type_traits.test.cpp +++ b/src/bsoncxx/test/type_traits.test.cpp @@ -3,8 +3,6 @@ #include -#include - #include // We declare variables that are only used for compilation checking diff --git a/src/mongocxx/lib/mongocxx/private/export.hh b/src/mongocxx/lib/mongocxx/private/export.hh index 0224992959..100d8723b7 100644 --- a/src/mongocxx/lib/mongocxx/private/export.hh +++ b/src/mongocxx/lib/mongocxx/private/export.hh @@ -14,6 +14,8 @@ #pragma once +#include + // See src/bsoncxx/lib/bsoncxx/private/export.hh for an explanation of // the purpose of this header. diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp index 344337d8be..36790fffd0 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include @@ -26,6 +27,7 @@ #include +#include #include #if !defined(__has_feature) diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp index ca4be3350d..7c50860e7a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp @@ -14,6 +14,10 @@ #include +// + +#include + namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp index dca624fc5d..9408637793 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp @@ -17,8 +17,6 @@ #include #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp index 424ff53201..e91c1996d1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp @@ -319,5 +319,3 @@ int index::wiredtiger_storage_options::type() const { } // namespace options } // namespace v_noabi } // namespace mongocxx - -#include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/range.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/range.cpp index 127c0c337d..0eab07c2af 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/range.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/range.cpp @@ -14,8 +14,6 @@ #include -#include - namespace mongocxx { namespace v_noabi { namespace options { diff --git a/src/mongocxx/test/catch.cpp b/src/mongocxx/test/catch.cpp index 9e11603f04..001f594159 100644 --- a/src/mongocxx/test/catch.cpp +++ b/src/mongocxx/test/catch.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include #include diff --git a/src/mongocxx/test/client.cpp b/src/mongocxx/test/client.cpp index 642124b4de..0a2c3fc9cb 100644 --- a/src/mongocxx/test/client.cpp +++ b/src/mongocxx/test/client.cpp @@ -12,9 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + +// + +#include + #include -#include #include #include #include diff --git a/src/mongocxx/test/client_helpers.cpp b/src/mongocxx/test/client_helpers.cpp index 65fd5ee1d3..d2643ffb61 100644 --- a/src/mongocxx/test/client_helpers.cpp +++ b/src/mongocxx/test/client_helpers.cpp @@ -36,10 +36,9 @@ #include #include +#include #include -#include - #include #include diff --git a/src/mongocxx/test/client_side_encryption.cpp b/src/mongocxx/test/client_side_encryption.cpp index a1f0896c8a..0d26eb6a20 100644 --- a/src/mongocxx/test/client_side_encryption.cpp +++ b/src/mongocxx/test/client_side_encryption.cpp @@ -44,8 +44,6 @@ #include -#include - #include #include diff --git a/src/mongocxx/test/spec/unified_tests/assert.cpp b/src/mongocxx/test/spec/unified_tests/assert.cpp index ea95447962..a11656ff09 100644 --- a/src/mongocxx/test/spec/unified_tests/assert.cpp +++ b/src/mongocxx/test/spec/unified_tests/assert.cpp @@ -14,6 +14,10 @@ #include "assert.hh" +// + +#include + #include #include #include @@ -24,8 +28,6 @@ #include #include -#include - #include #include diff --git a/src/mongocxx/test/spec/unified_tests/entity.cpp b/src/mongocxx/test/spec/unified_tests/entity.cpp index c5d2c1df30..4d8510df81 100644 --- a/src/mongocxx/test/spec/unified_tests/entity.cpp +++ b/src/mongocxx/test/spec/unified_tests/entity.cpp @@ -18,8 +18,6 @@ #include -#include - namespace mongocxx { namespace entity { diff --git a/src/mongocxx/test/spec/unified_tests/operations.cpp b/src/mongocxx/test/spec/unified_tests/operations.cpp index d1ee431d6c..fa0cd60982 100644 --- a/src/mongocxx/test/spec/unified_tests/operations.cpp +++ b/src/mongocxx/test/spec/unified_tests/operations.cpp @@ -25,8 +25,6 @@ #include #include -#include - #include #include From a4b9049570c5be69098820c5a36f3162585bc69c Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 16 Jan 2025 10:19:22 -0600 Subject: [PATCH 08/22] v_noabi: itoa.hh --- src/bsoncxx/lib/bsoncxx/private/itoa.cpp | 33 ++++++++++++------------ src/bsoncxx/lib/bsoncxx/private/itoa.hh | 23 +++++++++-------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/bsoncxx/lib/bsoncxx/private/itoa.cpp b/src/bsoncxx/lib/bsoncxx/private/itoa.cpp index 5feaa7e27c..0be47bc48f 100644 --- a/src/bsoncxx/lib/bsoncxx/private/itoa.cpp +++ b/src/bsoncxx/lib/bsoncxx/private/itoa.cpp @@ -18,7 +18,7 @@ namespace bsoncxx { namespace { -constexpr char kIndexTable[] = +constexpr char k_index_table[] = "0\0" "1\0" "2\0" @@ -1019,38 +1019,39 @@ constexpr char kIndexTable[] = "997\0" "998\0" "999\0"; + } // namespace -itoa::itoa(uint32_t val) : _val(val) { +itoa::itoa(std::uint32_t val) : _val(val) { _init(); } -itoa& itoa::operator=(uint32_t new_val) { +itoa& itoa::operator=(std::uint32_t new_val) { _val = new_val; _init(); return *this; } void itoa::_init() { - if (_val < 10) { - _str = kIndexTable + (2 * _val); - _len = 1; - } else if (_val < 100) { - _str = kIndexTable + (2 * 10) + (3 * (_val - 10)); - _len = 2; - } else if (_val < 1000) { - _str = kIndexTable + (2 * 10) + (3 * 90) + (4 * (_val - 100)); - _len = 3; + if (_val < 10u) { + _str = k_index_table + (2u * _val); + _len = 1u; + } else if (_val < 100u) { + _str = k_index_table + (2u * 10u) + (3u * (_val - 10u)); + _len = 2u; + } else if (_val < 1000u) { + _str = k_index_table + (2u * 10u) + (3u * 90u) + (4 * (_val - 100u)); + _len = 3u; } else { - int size = static_cast(sizeof(_buf) - 1); + int size = static_cast(sizeof(_buf) - 1u); int i = size; _buf[i] = '\0'; - while (_val > 0) { + while (_val > 0u) { i--; - _buf[i] = static_cast((_val % 10) + '0'); - _val = _val / 10; + _buf[i] = static_cast((_val % 10u) + '0'); + _val = _val / 10u; } _str = _buf + i; diff --git a/src/bsoncxx/lib/bsoncxx/private/itoa.hh b/src/bsoncxx/lib/bsoncxx/private/itoa.hh index 92f2668471..1a6ceeeb65 100644 --- a/src/bsoncxx/lib/bsoncxx/private/itoa.hh +++ b/src/bsoncxx/lib/bsoncxx/private/itoa.hh @@ -22,20 +22,26 @@ namespace bsoncxx { class itoa { - public: - explicit BSONCXX_ABI_EXPORT_CDECL_TESTING() itoa(uint32_t i = 0); + private: + std::uint32_t _val; + char const* _str; + std::uint8_t _len; + char _buf[11]; + public: ~itoa() = default; - itoa(itoa&& rhs) = delete; itoa& operator=(itoa&&) = delete; - itoa(itoa const& rhs) = delete; itoa& operator=(itoa const&) = delete; - BSONCXX_ABI_EXPORT_CDECL_TESTING(itoa&) operator=(uint32_t new_value); + itoa() : itoa(0u) {} + + explicit BSONCXX_ABI_EXPORT_CDECL_TESTING() itoa(std::uint32_t i); + + itoa& operator=(std::uint32_t new_value); - uint32_t val() const { + std::uint32_t val() const { return _val; } @@ -49,11 +55,6 @@ class itoa { private: void _init(); - - uint32_t _val; - char const* _str; - uint8_t _len; - char _buf[11]; }; } // namespace bsoncxx From 9954cadd60e3f103f384f641dd50fdc38d121f27 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 16 Jan 2025 10:19:22 -0600 Subject: [PATCH 09/22] v_noabi: suppress_deprecation_warnings.hh --- .../private/suppress_deprecation_warnings.hh | 35 ++++--------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/src/bsoncxx/lib/bsoncxx/private/suppress_deprecation_warnings.hh b/src/bsoncxx/lib/bsoncxx/private/suppress_deprecation_warnings.hh index 915afa6aa0..9aff17b04e 100644 --- a/src/bsoncxx/lib/bsoncxx/private/suppress_deprecation_warnings.hh +++ b/src/bsoncxx/lib/bsoncxx/private/suppress_deprecation_warnings.hh @@ -14,34 +14,11 @@ #pragma once -// The macros BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_BEGIN and -// BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_END are intended for the use of disabling deprecation -// warnings for a given section of code. -// -// Example usage: -// -// { -// some_function(); -// BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_BEGIN; -// some_deprecated_function(); -// BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_END; -// some_other_function(); -// } +#include -#ifdef __clang__ -#define BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_BEGIN \ - _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") -#elif defined __GNUC__ -#define BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_BEGIN \ - _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -#elif defined _MSC_VER -#define BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_BEGIN __pragma(warning(push)) __pragma(warning(disable : 4996)) -#endif +#define BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_BEGIN \ + BSONCXX_PRIVATE_WARNINGS_PUSH(); \ + BSONCXX_PRIVATE_WARNINGS_DISABLE(GNU("-Wdeprecated-declarations")); \ + BSONCXX_PRIVATE_WARNINGS_DISABLE(MSVC(4996)); -#ifdef __clang__ -#define BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_END _Pragma("clang diagnostic pop") -#elif defined __GNUC__ -#define BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_END _Pragma("GCC diagnostic pop") -#elif defined _MSC_VER -#define BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_END __pragma(warning(pop)) -#endif +#define BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_END BSONCXX_PRIVATE_WARNINGS_POP(); From ad5609e0336cc5cf7e2e330ad01f1d7a15431002 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 16 Jan 2025 10:19:23 -0600 Subject: [PATCH 10/22] v_noabi: bson.hh <- libbson.hh --- src/bsoncxx/lib/bsoncxx/private/{libbson.hh => bson.hh} | 0 src/mongocxx/lib/mongocxx/private/{libbson.cpp => bson.cpp} | 0 src/mongocxx/lib/mongocxx/private/{libbson.hh => bson.hh} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename src/bsoncxx/lib/bsoncxx/private/{libbson.hh => bson.hh} (100%) rename src/mongocxx/lib/mongocxx/private/{libbson.cpp => bson.cpp} (100%) rename src/mongocxx/lib/mongocxx/private/{libbson.hh => bson.hh} (100%) diff --git a/src/bsoncxx/lib/bsoncxx/private/libbson.hh b/src/bsoncxx/lib/bsoncxx/private/bson.hh similarity index 100% rename from src/bsoncxx/lib/bsoncxx/private/libbson.hh rename to src/bsoncxx/lib/bsoncxx/private/bson.hh diff --git a/src/mongocxx/lib/mongocxx/private/libbson.cpp b/src/mongocxx/lib/mongocxx/private/bson.cpp similarity index 100% rename from src/mongocxx/lib/mongocxx/private/libbson.cpp rename to src/mongocxx/lib/mongocxx/private/bson.cpp diff --git a/src/mongocxx/lib/mongocxx/private/libbson.hh b/src/mongocxx/lib/mongocxx/private/bson.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/private/libbson.hh rename to src/mongocxx/lib/mongocxx/private/bson.hh From 8dd2eda0d533e2bc1fb8589b4f2ea43fabdb67af Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 16 Jan 2025 10:19:23 -0600 Subject: [PATCH 11/22] v_noabi: bson.hh (CXX-1366) --- src/bsoncxx/lib/CMakeLists.txt | 2 +- src/bsoncxx/lib/bsoncxx/private/bson.hh | 29 +++++++++---------- src/bsoncxx/lib/bsoncxx/private/helpers.hh | 2 +- .../bsoncxx/v_noabi/bsoncxx/array/view.cpp | 2 +- .../bsoncxx/v_noabi/bsoncxx/builder/core.cpp | 2 +- .../bsoncxx/v_noabi/bsoncxx/decimal128.cpp | 2 +- .../v_noabi/bsoncxx/document/element.cpp | 2 +- .../bsoncxx/v_noabi/bsoncxx/document/view.cpp | 2 +- .../lib/bsoncxx/v_noabi/bsoncxx/json.cpp | 2 +- .../lib/bsoncxx/v_noabi/bsoncxx/oid.cpp | 2 +- .../bsoncxx/types/bson_value/private/value.hh | 2 +- .../v_noabi/bsoncxx/types/bson_value/view.cpp | 2 +- .../v_noabi/bsoncxx/types/private/convert.hh | 2 +- .../lib/bsoncxx/v_noabi/bsoncxx/validate.cpp | 2 +- src/bsoncxx/test/bson_builder.cpp | 2 +- src/bsoncxx/test/json.cpp | 2 +- src/bsoncxx/test/oid.cpp | 2 +- src/mongocxx/lib/CMakeLists.txt | 4 +-- src/mongocxx/lib/mongocxx/private/bson.cpp | 2 +- src/mongocxx/lib/mongocxx/private/bson.hh | 2 +- .../lib/mongocxx/private/change_stream.hh | 2 +- .../lib/mongocxx/private/client_encryption.hh | 4 +-- .../lib/mongocxx/private/client_session.hh | 4 +-- .../lib/mongocxx/private/collection.hh | 2 +- .../lib/mongocxx/private/index_view.hh | 2 +- .../lib/mongocxx/private/scoped_bson_value.hh | 2 +- .../lib/mongocxx/private/search_index_view.hh | 2 +- .../mongocxx/v_noabi/mongocxx/bulk_write.cpp | 2 +- .../lib/mongocxx/v_noabi/mongocxx/client.cpp | 2 +- .../mongocxx/v_noabi/mongocxx/collection.cpp | 4 +-- .../lib/mongocxx/v_noabi/mongocxx/cursor.cpp | 2 +- .../mongocxx/v_noabi/mongocxx/database.cpp | 2 +- .../mongocxx/events/command_failed_event.cpp | 2 +- .../exception/operation_exception.cpp | 2 +- .../mongocxx/options/auto_encryption.cpp | 2 +- .../mongocxx/options/client_encryption.cpp | 2 +- .../v_noabi/mongocxx/options/data_key.cpp | 2 +- .../v_noabi/mongocxx/options/encrypt.cpp | 2 +- .../mongocxx/options/rewrap_many_datakey.cpp | 2 +- .../v_noabi/mongocxx/read_preference.cpp | 2 +- .../mongocxx/result/rewrap_many_datakey.cpp | 2 +- src/mongocxx/test/change_streams.cpp | 4 +-- src/mongocxx/test/client_side_encryption.cpp | 2 +- src/mongocxx/test/collection.cpp | 2 +- src/mongocxx/test/collection_mocked.cpp | 4 +-- src/mongocxx/test/database.cpp | 2 +- src/mongocxx/test/private/numeric_casting.cpp | 2 +- src/mongocxx/test/private/scoped_bson_t.cpp | 2 +- 48 files changed, 66 insertions(+), 69 deletions(-) diff --git a/src/bsoncxx/lib/CMakeLists.txt b/src/bsoncxx/lib/CMakeLists.txt index 4c8df16ca6..325365eef9 100644 --- a/src/bsoncxx/lib/CMakeLists.txt +++ b/src/bsoncxx/lib/CMakeLists.txt @@ -93,7 +93,7 @@ set_dist_list(src_bsoncxx_lib_DIST bsoncxx/private/export.hh bsoncxx/private/helpers.hh bsoncxx/private/itoa.hh - bsoncxx/private/libbson.hh + bsoncxx/private/bson.hh bsoncxx/private/make_unique.hh bsoncxx/private/stack.hh bsoncxx/private/suppress_deprecation_warnings.hh diff --git a/src/bsoncxx/lib/bsoncxx/private/bson.hh b/src/bsoncxx/lib/bsoncxx/private/bson.hh index f35a62275b..3507bb69b1 100644 --- a/src/bsoncxx/lib/bsoncxx/private/bson.hh +++ b/src/bsoncxx/lib/bsoncxx/private/bson.hh @@ -14,22 +14,19 @@ #pragma once -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wconversion" -#elif defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#elif (_MSC_VER) -// TODO: CXX-1366 Disable MSVC warnings for libbson -#endif +#include + +BSONCXX_PRIVATE_WARNINGS_PUSH(); + +BSONCXX_PRIVATE_WARNINGS_DISABLE(GCC()); +BSONCXX_PRIVATE_WARNINGS_DISABLE(GCC("-Wall")); +BSONCXX_PRIVATE_WARNINGS_DISABLE(GCC("-Wextra")); +BSONCXX_PRIVATE_WARNINGS_DISABLE(GCC("-Wconversion")); + +BSONCXX_PRIVATE_WARNINGS_DISABLE(Clang("-Weverything")); + +BSONCXX_PRIVATE_IF_MSVC(BSONCXX_PRIVATE_PRAGMA(warning(push, 1))); #include -#if defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) -#pragma GCC diagnostic pop -#elif (_MSC_VER) -// TODO: CXX-1366 Disable MSVC warnings for libbson -#endif +BSONCXX_PRIVATE_WARNINGS_POP(); diff --git a/src/bsoncxx/lib/bsoncxx/private/helpers.hh b/src/bsoncxx/lib/bsoncxx/private/helpers.hh index 9c5de9f32a..4c1d889aec 100644 --- a/src/bsoncxx/lib/bsoncxx/private/helpers.hh +++ b/src/bsoncxx/lib/bsoncxx/private/helpers.hh @@ -18,7 +18,7 @@ #include #include -#include +#include namespace bsoncxx { namespace helpers { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp index 7de0d6047b..4e256d9e1f 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp @@ -19,8 +19,8 @@ #include #include +#include #include -#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp index 95eadfbdaa..ccafacd58e 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp @@ -22,8 +22,8 @@ #include #include +#include #include -#include #include #include #include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp index ed29b9f558..b9e4552d45 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp index d9f9b62236..a94861f3fc 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #define BSONCXX_CITER \ diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp index ce5d2ab6f7..4109c86f56 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp index 5b921cac31..a8424a2cea 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp index 2b58615650..d48a8b9541 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh index f5fb3600e9..182ec5dfed 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh @@ -17,7 +17,7 @@ #include #include -#include +#include namespace bsoncxx { namespace v_noabi { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp index 6219782b5d..7f5115336b 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #define BSONCXX_CITER \ diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh index ac254f08f0..543fc30b69 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh @@ -21,7 +21,7 @@ #include #include -#include +#include #include namespace bsoncxx { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp index 8532362ed7..7bb79809e9 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include namespace bsoncxx { diff --git a/src/bsoncxx/test/bson_builder.cpp b/src/bsoncxx/test/bson_builder.cpp index 0e6d757331..c882ee11b7 100644 --- a/src/bsoncxx/test/bson_builder.cpp +++ b/src/bsoncxx/test/bson_builder.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include diff --git a/src/bsoncxx/test/json.cpp b/src/bsoncxx/test/json.cpp index 220b9b32a4..150cbacdf1 100644 --- a/src/bsoncxx/test/json.cpp +++ b/src/bsoncxx/test/json.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include diff --git a/src/bsoncxx/test/oid.cpp b/src/bsoncxx/test/oid.cpp index ccec00437f..f494214095 100644 --- a/src/bsoncxx/test/oid.cpp +++ b/src/bsoncxx/test/oid.cpp @@ -21,7 +21,7 @@ #include -#include +#include #include diff --git a/src/mongocxx/lib/CMakeLists.txt b/src/mongocxx/lib/CMakeLists.txt index 10cddac32c..331a39fd11 100644 --- a/src/mongocxx/lib/CMakeLists.txt +++ b/src/mongocxx/lib/CMakeLists.txt @@ -13,8 +13,8 @@ # limitations under the License. set(mongocxx_sources_private + mongocxx/private/bson.cpp mongocxx/private/conversions.cpp - mongocxx/private/libbson.cpp mongocxx/private/libmongoc.cpp mongocxx/private/numeric_casting.cpp ) @@ -182,6 +182,7 @@ set_dist_list(src_mongocxx_lib_DIST ${mongocxx_sources_v_noabi} ${mongocxx_sources_v1} mongocxx/private/append_aggregate_options.hh + mongocxx/private/bson.hh mongocxx/private/bulk_write.hh mongocxx/private/change_stream.hh mongocxx/private/client_encryption.hh @@ -194,7 +195,6 @@ set_dist_list(src_mongocxx_lib_DIST mongocxx/private/database.hh mongocxx/private/export.hh mongocxx/private/index_view.hh - mongocxx/private/libbson.hh mongocxx/private/libmongoc_symbols.hh mongocxx/private/libmongoc.hh mongocxx/private/mock.hh diff --git a/src/mongocxx/lib/mongocxx/private/bson.cpp b/src/mongocxx/lib/mongocxx/private/bson.cpp index 22ace2f2cf..b7b8309248 100644 --- a/src/mongocxx/lib/mongocxx/private/bson.cpp +++ b/src/mongocxx/lib/mongocxx/private/bson.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include namespace mongocxx { namespace libbson { diff --git a/src/mongocxx/lib/mongocxx/private/bson.hh b/src/mongocxx/lib/mongocxx/private/bson.hh index eda44e373a..97782cc9a1 100644 --- a/src/mongocxx/lib/mongocxx/private/bson.hh +++ b/src/mongocxx/lib/mongocxx/private/bson.hh @@ -19,7 +19,7 @@ #include #include -#include +#include #include diff --git a/src/mongocxx/lib/mongocxx/private/change_stream.hh b/src/mongocxx/lib/mongocxx/private/change_stream.hh index 5ea373f708..67bc0a994b 100644 --- a/src/mongocxx/lib/mongocxx/private/change_stream.hh +++ b/src/mongocxx/lib/mongocxx/private/change_stream.hh @@ -21,7 +21,7 @@ #include #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/private/client_encryption.hh b/src/mongocxx/lib/mongocxx/private/client_encryption.hh index a79ed7c5d2..2a6d209536 100644 --- a/src/mongocxx/lib/mongocxx/private/client_encryption.hh +++ b/src/mongocxx/lib/mongocxx/private/client_encryption.hh @@ -29,12 +29,12 @@ #include #include +#include #include -#include +#include #include #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/private/client_session.hh b/src/mongocxx/lib/mongocxx/private/client_session.hh index c25c6501b4..01bcb066e7 100644 --- a/src/mongocxx/lib/mongocxx/private/client_session.hh +++ b/src/mongocxx/lib/mongocxx/private/client_session.hh @@ -25,11 +25,11 @@ #include #include +#include #include -#include +#include #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/private/collection.hh b/src/mongocxx/lib/mongocxx/private/collection.hh index efba8acbae..aa9f2d8032 100644 --- a/src/mongocxx/lib/mongocxx/private/collection.hh +++ b/src/mongocxx/lib/mongocxx/private/collection.hh @@ -22,8 +22,8 @@ #include +#include #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/private/index_view.hh b/src/mongocxx/lib/mongocxx/private/index_view.hh index d013d5614a..20d6ddadbd 100644 --- a/src/mongocxx/lib/mongocxx/private/index_view.hh +++ b/src/mongocxx/lib/mongocxx/private/index_view.hh @@ -29,8 +29,8 @@ #include #include +#include #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/private/scoped_bson_value.hh b/src/mongocxx/lib/mongocxx/private/scoped_bson_value.hh index 2027ed366d..6f647e0688 100644 --- a/src/mongocxx/lib/mongocxx/private/scoped_bson_value.hh +++ b/src/mongocxx/lib/mongocxx/private/scoped_bson_value.hh @@ -19,7 +19,7 @@ #include #include -#include +#include namespace mongocxx { namespace detail { diff --git a/src/mongocxx/lib/mongocxx/private/search_index_view.hh b/src/mongocxx/lib/mongocxx/private/search_index_view.hh index f0ba91a46b..28a3585a27 100644 --- a/src/mongocxx/lib/mongocxx/private/search_index_view.hh +++ b/src/mongocxx/lib/mongocxx/private/search_index_view.hh @@ -10,8 +10,8 @@ #include #include +#include #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp index bc38325b41..348cf0edbc 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp @@ -23,10 +23,10 @@ #include +#include #include #include #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp index db7c8b3043..d2062aede9 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp @@ -26,9 +26,9 @@ #include +#include #include #include -#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp index c02a3f6bee..1cf3149ff0 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp @@ -45,15 +45,15 @@ #include #include +#include #include -#include #include +#include #include #include #include #include -#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp index 76150dcccf..816d4e2ced 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp index 497605cae7..818cb086fe 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp @@ -28,10 +28,10 @@ #include +#include #include #include #include -#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp index c6b9c03abc..6e0cd66422 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp @@ -17,8 +17,8 @@ #include +#include #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp index bd6a7d7e7e..cc2ec51b29 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp index 4c919f3c98..db53468d90 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp @@ -18,8 +18,8 @@ #include #include +#include #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp index 598c7f1509..1a4bb9269e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp @@ -15,8 +15,8 @@ #include #include +#include #include -#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp index 9408637793..a5081680c4 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp index 0969ebf4f2..605c763eba 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp index c219b49449..8edad6f815 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp index f5b6c09166..43f5ee812b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp @@ -20,8 +20,8 @@ #include +#include #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp index d4af1552b1..2e59de52c8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/test/change_streams.cpp b/src/mongocxx/test/change_streams.cpp index 75cacb216c..154b713f85 100644 --- a/src/mongocxx/test/change_streams.cpp +++ b/src/mongocxx/test/change_streams.cpp @@ -27,9 +27,9 @@ #include #include -#include +#include -#include +#include #include diff --git a/src/mongocxx/test/client_side_encryption.cpp b/src/mongocxx/test/client_side_encryption.cpp index 0d26eb6a20..3670aa4411 100644 --- a/src/mongocxx/test/client_side_encryption.cpp +++ b/src/mongocxx/test/client_side_encryption.cpp @@ -42,7 +42,7 @@ #include -#include +#include #include diff --git a/src/mongocxx/test/collection.cpp b/src/mongocxx/test/collection.cpp index c65ef0b6f5..20fd55fecf 100644 --- a/src/mongocxx/test/collection.cpp +++ b/src/mongocxx/test/collection.cpp @@ -38,7 +38,7 @@ #include -#include +#include #include #include diff --git a/src/mongocxx/test/collection_mocked.cpp b/src/mongocxx/test/collection_mocked.cpp index 1d52908f6f..dc72f7847c 100644 --- a/src/mongocxx/test/collection_mocked.cpp +++ b/src/mongocxx/test/collection_mocked.cpp @@ -30,11 +30,11 @@ #include #include +#include #include -#include +#include #include -#include #include #include diff --git a/src/mongocxx/test/database.cpp b/src/mongocxx/test/database.cpp index 271b17eb3d..c3132c6781 100644 --- a/src/mongocxx/test/database.cpp +++ b/src/mongocxx/test/database.cpp @@ -25,8 +25,8 @@ #include #include +#include #include -#include #include #include diff --git a/src/mongocxx/test/private/numeric_casting.cpp b/src/mongocxx/test/private/numeric_casting.cpp index 08436076e3..dfaaaaf98e 100644 --- a/src/mongocxx/test/private/numeric_casting.cpp +++ b/src/mongocxx/test/private/numeric_casting.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include #include diff --git a/src/mongocxx/test/private/scoped_bson_t.cpp b/src/mongocxx/test/private/scoped_bson_t.cpp index a8f19cd305..a21cc4382f 100644 --- a/src/mongocxx/test/private/scoped_bson_t.cpp +++ b/src/mongocxx/test/private/scoped_bson_t.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include From 0888c57f89566d5fb760936daa7fafbaedc1ea9e Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 16 Jan 2025 10:19:23 -0600 Subject: [PATCH 12/22] v_noabi: mongoc.hh <- libmongoc.hh --- src/mongocxx/lib/mongocxx/private/{libmongoc.cpp => mongoc.cpp} | 0 src/mongocxx/lib/mongocxx/private/{libmongoc.hh => mongoc.hh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/mongocxx/lib/mongocxx/private/{libmongoc.cpp => mongoc.cpp} (100%) rename src/mongocxx/lib/mongocxx/private/{libmongoc.hh => mongoc.hh} (100%) diff --git a/src/mongocxx/lib/mongocxx/private/libmongoc.cpp b/src/mongocxx/lib/mongocxx/private/mongoc.cpp similarity index 100% rename from src/mongocxx/lib/mongocxx/private/libmongoc.cpp rename to src/mongocxx/lib/mongocxx/private/mongoc.cpp diff --git a/src/mongocxx/lib/mongocxx/private/libmongoc.hh b/src/mongocxx/lib/mongocxx/private/mongoc.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/private/libmongoc.hh rename to src/mongocxx/lib/mongocxx/private/mongoc.hh From 4765973db630d7bef4ad727a694ba126c52a1ba8 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 16 Jan 2025 10:19:24 -0600 Subject: [PATCH 13/22] v_noabi: mongoc.hh (CXX-1366) --- src/mongocxx/lib/CMakeLists.txt | 5 +- .../lib/mongocxx/private/bulk_write.hh | 2 +- .../lib/mongocxx/private/change_stream.hh | 2 +- src/mongocxx/lib/mongocxx/private/client.hh | 2 +- .../lib/mongocxx/private/client_encryption.hh | 2 +- .../lib/mongocxx/private/client_session.hh | 2 +- .../lib/mongocxx/private/conversions.hh | 2 +- src/mongocxx/lib/mongocxx/private/cursor.hh | 2 +- src/mongocxx/lib/mongocxx/private/database.hh | 2 +- .../lib/mongocxx/private/index_view.hh | 2 +- .../lib/mongocxx/private/libmongoc_symbols.hh | 378 --------------- src/mongocxx/lib/mongocxx/private/mongoc.cpp | 19 +- src/mongocxx/lib/mongocxx/private/mongoc.hh | 441 ++++++++++++++++-- src/mongocxx/lib/mongocxx/private/pool.hh | 2 +- .../lib/mongocxx/private/read_concern.hh | 2 +- .../lib/mongocxx/private/read_preference.hh | 2 +- .../lib/mongocxx/private/search_index_view.hh | 2 +- src/mongocxx/lib/mongocxx/private/uri.hh | 2 +- .../lib/mongocxx/private/write_concern.hh | 2 +- .../mongocxx/v_noabi/mongocxx/bulk_write.cpp | 2 +- .../v_noabi/mongocxx/change_stream.cpp | 2 +- .../mongocxx/v_noabi/mongocxx/collection.cpp | 2 +- .../lib/mongocxx/v_noabi/mongocxx/cursor.cpp | 2 +- .../mongocxx/v_noabi/mongocxx/database.cpp | 2 +- .../mongocxx/events/command_failed_event.cpp | 2 +- .../mongocxx/events/command_started_event.cpp | 2 +- .../events/command_succeeded_event.cpp | 2 +- .../events/heartbeat_failed_event.cpp | 2 +- .../events/heartbeat_started_event.cpp | 2 +- .../events/heartbeat_succeeded_event.cpp | 2 +- .../mongocxx/events/server_changed_event.cpp | 2 +- .../mongocxx/events/server_closed_event.cpp | 2 +- .../mongocxx/events/server_description.cpp | 2 +- .../mongocxx/events/server_opening_event.cpp | 2 +- .../events/topology_changed_event.cpp | 2 +- .../mongocxx/events/topology_closed_event.cpp | 2 +- .../mongocxx/events/topology_description.cpp | 2 +- .../events/topology_opening_event.cpp | 2 +- .../exception/operation_exception.cpp | 2 +- .../exception/private/mongoc_error.hh | 2 +- .../mongocxx/v_noabi/mongocxx/instance.cpp | 2 +- .../mongocxx/options/auto_encryption.cpp | 2 +- .../mongocxx/options/client_encryption.cpp | 2 +- .../v_noabi/mongocxx/options/data_key.cpp | 2 +- .../v_noabi/mongocxx/options/encrypt.cpp | 2 +- .../v_noabi/mongocxx/options/index.cpp | 2 +- .../v_noabi/mongocxx/options/private/apm.hh | 2 +- .../mongocxx/options/private/server_api.hh | 2 +- .../v_noabi/mongocxx/options/private/ssl.hh | 2 +- .../mongocxx/options/rewrap_many_datakey.cpp | 2 +- .../v_noabi/mongocxx/options/server_api.cpp | 2 +- .../v_noabi/mongocxx/read_concern.cpp | 2 +- .../v_noabi/mongocxx/read_preference.cpp | 2 +- .../lib/mongocxx/v_noabi/mongocxx/uri.cpp | 2 +- .../v_noabi/mongocxx/write_concern.cpp | 2 +- src/mongocxx/test/bulk_write.cpp | 2 +- src/mongocxx/test/catch_helpers.hh | 2 +- src/mongocxx/test/client.cpp | 2 +- src/mongocxx/test/client_helpers.cpp | 2 +- src/mongocxx/test/client_helpers.hh | 2 +- src/mongocxx/test/client_session.cpp | 2 +- src/mongocxx/test/collection.cpp | 2 +- src/mongocxx/test/collection_mocked.cpp | 2 +- src/mongocxx/test/database.cpp | 2 +- src/mongocxx/test/logging.cpp | 2 +- src/mongocxx/test/pool.cpp | 2 +- src/mongocxx/test/private/write_concern.cpp | 2 +- src/mongocxx/test/spec/operation.hh | 2 +- 68 files changed, 477 insertions(+), 494 deletions(-) delete mode 100644 src/mongocxx/lib/mongocxx/private/libmongoc_symbols.hh diff --git a/src/mongocxx/lib/CMakeLists.txt b/src/mongocxx/lib/CMakeLists.txt index 331a39fd11..404c72e043 100644 --- a/src/mongocxx/lib/CMakeLists.txt +++ b/src/mongocxx/lib/CMakeLists.txt @@ -15,7 +15,7 @@ set(mongocxx_sources_private mongocxx/private/bson.cpp mongocxx/private/conversions.cpp - mongocxx/private/libmongoc.cpp + mongocxx/private/mongoc.cpp mongocxx/private/numeric_casting.cpp ) @@ -195,9 +195,8 @@ set_dist_list(src_mongocxx_lib_DIST mongocxx/private/database.hh mongocxx/private/export.hh mongocxx/private/index_view.hh - mongocxx/private/libmongoc_symbols.hh - mongocxx/private/libmongoc.hh mongocxx/private/mock.hh + mongocxx/private/mongoc.hh mongocxx/private/numeric_casting.hh mongocxx/private/pipeline.hh mongocxx/private/pool.hh diff --git a/src/mongocxx/lib/mongocxx/private/bulk_write.hh b/src/mongocxx/lib/mongocxx/private/bulk_write.hh index 296d520721..3054300ed3 100644 --- a/src/mongocxx/lib/mongocxx/private/bulk_write.hh +++ b/src/mongocxx/lib/mongocxx/private/bulk_write.hh @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/private/change_stream.hh b/src/mongocxx/lib/mongocxx/private/change_stream.hh index 67bc0a994b..f8f91a1f2f 100644 --- a/src/mongocxx/lib/mongocxx/private/change_stream.hh +++ b/src/mongocxx/lib/mongocxx/private/change_stream.hh @@ -22,7 +22,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/private/client.hh b/src/mongocxx/lib/mongocxx/private/client.hh index 47f59372d6..21367e08d5 100644 --- a/src/mongocxx/lib/mongocxx/private/client.hh +++ b/src/mongocxx/lib/mongocxx/private/client.hh @@ -18,7 +18,7 @@ #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/private/client_encryption.hh b/src/mongocxx/lib/mongocxx/private/client_encryption.hh index 2a6d209536..f7ac8757bb 100644 --- a/src/mongocxx/lib/mongocxx/private/client_encryption.hh +++ b/src/mongocxx/lib/mongocxx/private/client_encryption.hh @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/private/client_session.hh b/src/mongocxx/lib/mongocxx/private/client_session.hh index 01bcb066e7..2462c55004 100644 --- a/src/mongocxx/lib/mongocxx/private/client_session.hh +++ b/src/mongocxx/lib/mongocxx/private/client_session.hh @@ -30,7 +30,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/private/conversions.hh b/src/mongocxx/lib/mongocxx/private/conversions.hh index 8b38865750..af199afc2f 100644 --- a/src/mongocxx/lib/mongocxx/private/conversions.hh +++ b/src/mongocxx/lib/mongocxx/private/conversions.hh @@ -17,7 +17,7 @@ #include #include -#include +#include namespace mongocxx { namespace libmongoc { diff --git a/src/mongocxx/lib/mongocxx/private/cursor.hh b/src/mongocxx/lib/mongocxx/private/cursor.hh index ce0a7c2445..939e2e28ba 100644 --- a/src/mongocxx/lib/mongocxx/private/cursor.hh +++ b/src/mongocxx/lib/mongocxx/private/cursor.hh @@ -19,7 +19,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/private/database.hh b/src/mongocxx/lib/mongocxx/private/database.hh index 05e44a7bc5..8ede4f945b 100644 --- a/src/mongocxx/lib/mongocxx/private/database.hh +++ b/src/mongocxx/lib/mongocxx/private/database.hh @@ -18,7 +18,7 @@ #include #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/private/index_view.hh b/src/mongocxx/lib/mongocxx/private/index_view.hh index 20d6ddadbd..d53dc1a898 100644 --- a/src/mongocxx/lib/mongocxx/private/index_view.hh +++ b/src/mongocxx/lib/mongocxx/private/index_view.hh @@ -31,7 +31,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/private/libmongoc_symbols.hh b/src/mongocxx/lib/mongocxx/private/libmongoc_symbols.hh deleted file mode 100644 index e4d322f923..0000000000 --- a/src/mongocxx/lib/mongocxx/private/libmongoc_symbols.hh +++ /dev/null @@ -1,378 +0,0 @@ -// Copyright 2009-present MongoDB, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include - -MONGOCXX_LIBMONGOC_SYMBOL(apm_callbacks_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(apm_callbacks_new) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_failed_get_command_name) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_failed_get_context) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_failed_get_duration) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_failed_get_error) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_failed_get_host) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_failed_get_operation_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_failed_get_reply) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_failed_get_request_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_failed_get_server_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_failed_get_service_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_started_get_command) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_started_get_command_name) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_started_get_context) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_started_get_database_name) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_started_get_host) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_started_get_operation_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_started_get_request_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_started_get_server_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_started_get_service_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_succeeded_get_command_name) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_succeeded_get_context) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_succeeded_get_duration) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_succeeded_get_host) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_succeeded_get_operation_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_succeeded_get_reply) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_succeeded_get_request_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_succeeded_get_server_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_command_succeeded_get_service_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_changed_get_context) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_changed_get_host) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_changed_get_new_description) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_changed_get_previous_description) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_changed_get_topology_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_closed_get_context) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_closed_get_host) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_closed_get_topology_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_heartbeat_failed_get_awaited) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_heartbeat_failed_get_context) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_heartbeat_failed_get_duration) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_heartbeat_failed_get_error) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_heartbeat_failed_get_host) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_heartbeat_started_get_awaited) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_heartbeat_started_get_context) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_heartbeat_started_get_host) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_heartbeat_succeeded_get_awaited) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_heartbeat_succeeded_get_context) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_heartbeat_succeeded_get_duration) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_heartbeat_succeeded_get_host) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_heartbeat_succeeded_get_reply) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_opening_get_context) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_opening_get_host) -MONGOCXX_LIBMONGOC_SYMBOL(apm_server_opening_get_topology_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_set_command_failed_cb) -MONGOCXX_LIBMONGOC_SYMBOL(apm_set_command_started_cb) -MONGOCXX_LIBMONGOC_SYMBOL(apm_set_command_succeeded_cb) -MONGOCXX_LIBMONGOC_SYMBOL(apm_set_server_changed_cb) -MONGOCXX_LIBMONGOC_SYMBOL(apm_set_server_closed_cb) -MONGOCXX_LIBMONGOC_SYMBOL(apm_set_server_heartbeat_failed_cb) -MONGOCXX_LIBMONGOC_SYMBOL(apm_set_server_heartbeat_started_cb) -MONGOCXX_LIBMONGOC_SYMBOL(apm_set_server_heartbeat_succeeded_cb) -MONGOCXX_LIBMONGOC_SYMBOL(apm_set_server_opening_cb) -MONGOCXX_LIBMONGOC_SYMBOL(apm_set_topology_changed_cb) -MONGOCXX_LIBMONGOC_SYMBOL(apm_set_topology_closed_cb) -MONGOCXX_LIBMONGOC_SYMBOL(apm_set_topology_opening_cb) -MONGOCXX_LIBMONGOC_SYMBOL(apm_topology_changed_get_context) -MONGOCXX_LIBMONGOC_SYMBOL(apm_topology_changed_get_new_description) -MONGOCXX_LIBMONGOC_SYMBOL(apm_topology_changed_get_previous_description) -MONGOCXX_LIBMONGOC_SYMBOL(apm_topology_changed_get_topology_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_topology_closed_get_context) -MONGOCXX_LIBMONGOC_SYMBOL(apm_topology_closed_get_topology_id) -MONGOCXX_LIBMONGOC_SYMBOL(apm_topology_opening_get_context) -MONGOCXX_LIBMONGOC_SYMBOL(apm_topology_opening_get_topology_id) -MONGOCXX_LIBMONGOC_SYMBOL(auto_encryption_opts_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(auto_encryption_opts_new) -MONGOCXX_LIBMONGOC_SYMBOL(auto_encryption_opts_set_bypass_auto_encryption) -MONGOCXX_LIBMONGOC_SYMBOL(auto_encryption_opts_set_bypass_query_analysis) -MONGOCXX_LIBMONGOC_SYMBOL(auto_encryption_opts_set_encrypted_fields_map) -MONGOCXX_LIBMONGOC_SYMBOL(auto_encryption_opts_set_extra) -MONGOCXX_LIBMONGOC_SYMBOL(auto_encryption_opts_set_keyvault_client) -MONGOCXX_LIBMONGOC_SYMBOL(auto_encryption_opts_set_keyvault_client_pool) -MONGOCXX_LIBMONGOC_SYMBOL(auto_encryption_opts_set_keyvault_namespace) -MONGOCXX_LIBMONGOC_SYMBOL(auto_encryption_opts_set_kms_providers) -MONGOCXX_LIBMONGOC_SYMBOL(auto_encryption_opts_set_schema_map) -MONGOCXX_LIBMONGOC_SYMBOL(auto_encryption_opts_set_tls_opts) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_execute) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_get_write_concern) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_insert_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_new) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_remove_many_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_remove_one_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_replace_one_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_set_bypass_document_validation) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_set_client) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_set_client_session) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_set_collection) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_set_database) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_set_write_concern) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_update_many_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(bulk_operation_update_one_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(change_stream_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(change_stream_error_document) -MONGOCXX_LIBMONGOC_SYMBOL(change_stream_get_resume_token) -MONGOCXX_LIBMONGOC_SYMBOL(change_stream_next) -MONGOCXX_LIBMONGOC_SYMBOL(cleanup) -MONGOCXX_LIBMONGOC_SYMBOL(client_command_simple_with_server_id) -MONGOCXX_LIBMONGOC_SYMBOL(client_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(client_enable_auto_encryption) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_add_key_alt_name) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_create_datakey) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_create_encrypted_collection) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_datakey_opts_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_datakey_opts_new) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_datakey_opts_set_keyaltnames) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_datakey_opts_set_keymaterial) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_datakey_opts_set_masterkey) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_decrypt) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_delete_key) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_expression) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_opts_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_opts_new) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_opts_set_algorithm) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_opts_set_contention_factor) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_opts_set_keyaltname) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_opts_set_keyid) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_opts_set_query_type) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_opts_set_range_opts) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_range_opts_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_range_opts_new) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_range_opts_set_min) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_range_opts_set_max) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_range_opts_set_precision) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_range_opts_set_sparsity) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_encrypt_range_opts_set_trim_factor) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_get_key) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_get_key_by_alt_name) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_get_keys) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_opts_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_opts_new) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_opts_set_keyvault_client) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_opts_set_keyvault_namespace) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_opts_set_kms_providers) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_opts_set_tls_opts) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_new) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_remove_key_alt_name) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_rewrap_many_datakey) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_rewrap_many_datakey_result_get_bulk_write_result) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_rewrap_many_datakey_result_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(client_encryption_rewrap_many_datakey_result_new) -MONGOCXX_LIBMONGOC_SYMBOL(client_find_databases_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(client_get_collection) -MONGOCXX_LIBMONGOC_SYMBOL(client_get_database) -MONGOCXX_LIBMONGOC_SYMBOL(client_get_database_names_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(client_get_read_concern) -MONGOCXX_LIBMONGOC_SYMBOL(client_get_read_prefs) -MONGOCXX_LIBMONGOC_SYMBOL(client_get_uri) -MONGOCXX_LIBMONGOC_SYMBOL(client_get_write_concern) -MONGOCXX_LIBMONGOC_SYMBOL(client_new_from_uri) -MONGOCXX_LIBMONGOC_SYMBOL(client_pool_enable_auto_encryption) -MONGOCXX_LIBMONGOC_SYMBOL(client_pool_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(client_pool_new) -MONGOCXX_LIBMONGOC_SYMBOL(client_pool_new_with_error) -MONGOCXX_LIBMONGOC_SYMBOL(client_pool_pop) -MONGOCXX_LIBMONGOC_SYMBOL(client_pool_push) -MONGOCXX_LIBMONGOC_SYMBOL(client_pool_set_apm_callbacks) -MONGOCXX_LIBMONGOC_SYMBOL(client_pool_set_server_api) -MONGOCXX_LIBMONGOC_SYMBOL(client_pool_try_pop) -MONGOCXX_LIBMONGOC_SYMBOL(client_reset) -MONGOCXX_LIBMONGOC_SYMBOL(client_select_server) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_abort_transaction) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_advance_cluster_time) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_advance_operation_time) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_append) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_commit_transaction) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_get_cluster_time) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_get_lsid) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_get_operation_time) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_get_opts) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_get_server_id) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_get_transaction_state) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_get_dirty) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_in_transaction) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_start_transaction) -MONGOCXX_LIBMONGOC_SYMBOL(client_session_with_transaction) -MONGOCXX_LIBMONGOC_SYMBOL(client_set_apm_callbacks) -MONGOCXX_LIBMONGOC_SYMBOL(client_set_read_concern) -MONGOCXX_LIBMONGOC_SYMBOL(client_set_read_prefs) -MONGOCXX_LIBMONGOC_SYMBOL(client_set_write_concern) -MONGOCXX_LIBMONGOC_SYMBOL(client_set_server_api) -MONGOCXX_LIBMONGOC_SYMBOL(client_start_session) -MONGOCXX_LIBMONGOC_SYMBOL(client_watch) -MONGOCXX_LIBMONGOC_SYMBOL(collection_aggregate) -MONGOCXX_LIBMONGOC_SYMBOL(collection_command_simple) -MONGOCXX_LIBMONGOC_SYMBOL(collection_copy) -// Remove these suppressions when CXX-1594 is done. -BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_BEGIN -MONGOCXX_LIBMONGOC_SYMBOL(collection_count_with_opts) -BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_END -MONGOCXX_LIBMONGOC_SYMBOL(collection_count_documents) -MONGOCXX_LIBMONGOC_SYMBOL(collection_create_bulk_operation_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(collection_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(collection_drop) -MONGOCXX_LIBMONGOC_SYMBOL(collection_drop_index) -MONGOCXX_LIBMONGOC_SYMBOL(collection_drop_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(collection_estimated_document_count) -MONGOCXX_LIBMONGOC_SYMBOL(collection_find_and_modify_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(collection_find_indexes_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(collection_find_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(collection_get_name) -MONGOCXX_LIBMONGOC_SYMBOL(collection_get_read_concern) -MONGOCXX_LIBMONGOC_SYMBOL(collection_get_read_prefs) -MONGOCXX_LIBMONGOC_SYMBOL(collection_get_write_concern) -MONGOCXX_LIBMONGOC_SYMBOL(collection_keys_to_index_string) -MONGOCXX_LIBMONGOC_SYMBOL(collection_read_command_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(collection_rename) -MONGOCXX_LIBMONGOC_SYMBOL(collection_rename_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(collection_set_read_concern) -MONGOCXX_LIBMONGOC_SYMBOL(collection_set_read_prefs) -MONGOCXX_LIBMONGOC_SYMBOL(collection_set_write_concern) -MONGOCXX_LIBMONGOC_SYMBOL(collection_watch) -MONGOCXX_LIBMONGOC_SYMBOL(collection_write_command_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(cursor_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(cursor_error) -MONGOCXX_LIBMONGOC_SYMBOL(cursor_error_document) -MONGOCXX_LIBMONGOC_SYMBOL(cursor_new_from_command_reply_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(cursor_next) -MONGOCXX_LIBMONGOC_SYMBOL(cursor_set_max_await_time_ms) -MONGOCXX_LIBMONGOC_SYMBOL(database_aggregate) -MONGOCXX_LIBMONGOC_SYMBOL(database_command_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(database_copy) -MONGOCXX_LIBMONGOC_SYMBOL(database_create_collection) -MONGOCXX_LIBMONGOC_SYMBOL(database_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(database_drop) -MONGOCXX_LIBMONGOC_SYMBOL(database_drop_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(database_find_collections_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(database_get_collection_names_with_opts) -MONGOCXX_LIBMONGOC_SYMBOL(database_get_collection) -MONGOCXX_LIBMONGOC_SYMBOL(database_get_read_concern) -MONGOCXX_LIBMONGOC_SYMBOL(database_get_read_prefs) -MONGOCXX_LIBMONGOC_SYMBOL(database_get_write_concern) -MONGOCXX_LIBMONGOC_SYMBOL(database_has_collection) -MONGOCXX_LIBMONGOC_SYMBOL(database_set_read_concern) -MONGOCXX_LIBMONGOC_SYMBOL(database_set_read_prefs) -MONGOCXX_LIBMONGOC_SYMBOL(database_set_write_concern) -MONGOCXX_LIBMONGOC_SYMBOL(database_watch) -MONGOCXX_LIBMONGOC_SYMBOL(error_has_label) -MONGOCXX_LIBMONGOC_SYMBOL(find_and_modify_opts_append) -MONGOCXX_LIBMONGOC_SYMBOL(find_and_modify_opts_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(find_and_modify_opts_new) -MONGOCXX_LIBMONGOC_SYMBOL(find_and_modify_opts_set_bypass_document_validation) -MONGOCXX_LIBMONGOC_SYMBOL(find_and_modify_opts_set_fields) -MONGOCXX_LIBMONGOC_SYMBOL(find_and_modify_opts_set_flags) -MONGOCXX_LIBMONGOC_SYMBOL(find_and_modify_opts_set_max_time_ms) -MONGOCXX_LIBMONGOC_SYMBOL(find_and_modify_opts_set_sort) -MONGOCXX_LIBMONGOC_SYMBOL(find_and_modify_opts_set_update) -MONGOCXX_LIBMONGOC_SYMBOL(handshake_data_append) -MONGOCXX_LIBMONGOC_SYMBOL(index_opt_geo_init) -MONGOCXX_LIBMONGOC_SYMBOL(index_opt_init) -MONGOCXX_LIBMONGOC_SYMBOL(index_opt_wt_init) -MONGOCXX_LIBMONGOC_SYMBOL(init) -// MONGOCXX_LIBMONGOC_SYMBOL(log_set_handler) // CDRIVER-5678: not __cdecl. -MONGOCXX_LIBMONGOC_SYMBOL(read_concern_copy) -MONGOCXX_LIBMONGOC_SYMBOL(read_concern_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(read_concern_get_level) -MONGOCXX_LIBMONGOC_SYMBOL(read_concern_new) -MONGOCXX_LIBMONGOC_SYMBOL(read_concern_set_level) -MONGOCXX_LIBMONGOC_SYMBOL(read_prefs_copy) -MONGOCXX_LIBMONGOC_SYMBOL(read_prefs_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(read_prefs_get_hedge) -MONGOCXX_LIBMONGOC_SYMBOL(read_prefs_get_max_staleness_seconds) -MONGOCXX_LIBMONGOC_SYMBOL(read_prefs_get_mode) -MONGOCXX_LIBMONGOC_SYMBOL(read_prefs_get_tags) -MONGOCXX_LIBMONGOC_SYMBOL(read_prefs_new) -MONGOCXX_LIBMONGOC_SYMBOL(read_prefs_set_hedge) -MONGOCXX_LIBMONGOC_SYMBOL(read_prefs_set_max_staleness_seconds) -MONGOCXX_LIBMONGOC_SYMBOL(read_prefs_set_mode) -MONGOCXX_LIBMONGOC_SYMBOL(read_prefs_set_tags) -MONGOCXX_LIBMONGOC_SYMBOL(server_api_version_to_string) -MONGOCXX_LIBMONGOC_SYMBOL(server_api_version_from_string) -MONGOCXX_LIBMONGOC_SYMBOL(server_api_new) -MONGOCXX_LIBMONGOC_SYMBOL(server_api_copy) -MONGOCXX_LIBMONGOC_SYMBOL(server_api_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(server_api_strict) -MONGOCXX_LIBMONGOC_SYMBOL(server_api_deprecation_errors) -MONGOCXX_LIBMONGOC_SYMBOL(server_api_get_deprecation_errors) -MONGOCXX_LIBMONGOC_SYMBOL(server_api_get_strict) -MONGOCXX_LIBMONGOC_SYMBOL(server_api_get_version) -MONGOCXX_LIBMONGOC_SYMBOL(server_description_host) -MONGOCXX_LIBMONGOC_SYMBOL(server_description_id) -MONGOCXX_LIBMONGOC_SYMBOL(server_description_hello_response) -MONGOCXX_LIBMONGOC_SYMBOL(server_description_round_trip_time) -MONGOCXX_LIBMONGOC_SYMBOL(server_description_type) -MONGOCXX_LIBMONGOC_SYMBOL(server_descriptions_destroy_all) -MONGOCXX_LIBMONGOC_SYMBOL(session_opts_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(session_opts_get_causal_consistency) -MONGOCXX_LIBMONGOC_SYMBOL(session_opts_get_snapshot) -MONGOCXX_LIBMONGOC_SYMBOL(session_opts_new) -MONGOCXX_LIBMONGOC_SYMBOL(session_opts_set_causal_consistency) -MONGOCXX_LIBMONGOC_SYMBOL(session_opts_set_snapshot) -MONGOCXX_LIBMONGOC_SYMBOL(session_opts_set_default_transaction_opts) -MONGOCXX_LIBMONGOC_SYMBOL(topology_description_get_servers) -MONGOCXX_LIBMONGOC_SYMBOL(topology_description_has_readable_server) -MONGOCXX_LIBMONGOC_SYMBOL(topology_description_has_writable_server) -MONGOCXX_LIBMONGOC_SYMBOL(topology_description_type) -MONGOCXX_LIBMONGOC_SYMBOL(transaction_opts_clone) -MONGOCXX_LIBMONGOC_SYMBOL(transaction_opts_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(transaction_opts_new) -MONGOCXX_LIBMONGOC_SYMBOL(transaction_opts_get_read_concern) -MONGOCXX_LIBMONGOC_SYMBOL(transaction_opts_get_read_prefs) -MONGOCXX_LIBMONGOC_SYMBOL(transaction_opts_get_write_concern) -MONGOCXX_LIBMONGOC_SYMBOL(transaction_opts_get_max_commit_time_ms) -MONGOCXX_LIBMONGOC_SYMBOL(transaction_opts_set_read_concern) -MONGOCXX_LIBMONGOC_SYMBOL(transaction_opts_set_read_prefs) -MONGOCXX_LIBMONGOC_SYMBOL(transaction_opts_set_write_concern) -MONGOCXX_LIBMONGOC_SYMBOL(transaction_opts_set_max_commit_time_ms) -MONGOCXX_LIBMONGOC_SYMBOL(uri_copy) -MONGOCXX_LIBMONGOC_SYMBOL(uri_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_auth_mechanism) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_auth_source) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_compressors) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_credentials) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_database) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_hosts) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_option_as_utf8) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_options) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_password) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_read_concern) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_read_prefs_t) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_replica_set) -BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_BEGIN -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_ssl) -BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_END -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_tls) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_string) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_username) -MONGOCXX_LIBMONGOC_SYMBOL(uri_get_write_concern) -MONGOCXX_LIBMONGOC_SYMBOL(uri_new_with_error) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_copy) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_destroy) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_get_journal) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_get_w) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_get_wmajority) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_get_wtag) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_get_wtimeout) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_is_acknowledged) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_journal_is_set) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_new) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_set_journal) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_set_w) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_set_wmajority) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_set_wtag) -MONGOCXX_LIBMONGOC_SYMBOL(write_concern_set_wtimeout) - -#if defined(MONGOC_ENABLE_SSL) -MONGOCXX_LIBMONGOC_SYMBOL(client_pool_set_ssl_opts) -MONGOCXX_LIBMONGOC_SYMBOL(client_set_ssl_opts) -#endif diff --git a/src/mongocxx/lib/mongocxx/private/mongoc.cpp b/src/mongocxx/lib/mongocxx/private/mongoc.cpp index f21a0d9010..4e7f5e5757 100644 --- a/src/mongocxx/lib/mongocxx/private/mongoc.cpp +++ b/src/mongocxx/lib/mongocxx/private/mongoc.cpp @@ -12,30 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "libmongoc.hh" +#include namespace mongocxx { namespace libmongoc { #ifdef MONGOCXX_TESTING -#if defined(__GNUC__) && (__GNUC__ >= 6) && !defined(__clang__) -// See libmongoc.hh for details on this diagnostic suppression -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wignored-attributes" -#endif +SILENCE_IGNORED_ATTRIBUTES_BEGIN(); -#define MONGOCXX_LIBMONGOC_SYMBOL(name) \ +#pragma push_macro("X") +#define X(name) \ test_util::mock& name = *new test_util::mock(mongoc_##name); -#include "libmongoc_symbols.hh" -#undef MONGOCXX_LIBMONGOC_SYMBOL +MONGOC_SYMBOLS_XMACRO(X) +#pragma pop_macro("X") mongocxx::test_util::mock& log_set_handler = *new test_util::mock(mongoc_log_set_handler); -#if defined(__GNUC__) && (__GNUC__ >= 6) && !defined(__clang__) -#pragma GCC diagnostic pop -#endif +SILENCE_IGNORED_ATTRIBUTES_END(); #endif // MONGOCXX_TESTING diff --git a/src/mongocxx/lib/mongocxx/private/mongoc.hh b/src/mongocxx/lib/mongocxx/private/mongoc.hh index 5548a1758e..99a3ccdcdd 100644 --- a/src/mongocxx/lib/mongocxx/private/mongoc.hh +++ b/src/mongocxx/lib/mongocxx/private/mongoc.hh @@ -14,48 +14,415 @@ #pragma once -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wconversion" -#elif defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#elif (_MSC_VER) -// TODO: CXX-1366 Disable MSVC warnings for libmongoc -#endif - -#include +#include -#if defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) -#pragma GCC diagnostic pop -#elif (_MSC_VER) -// TODO: CXX-1366 Disable MSVC warnings for libmongoc -#endif +#include #include #include -namespace mongocxx { -namespace libmongoc { - -#ifdef MONGOCXX_TESTING +BSONCXX_PRIVATE_WARNINGS_PUSH(); +BSONCXX_PRIVATE_WARNINGS_DISABLE(GNU("-Wconversion")) +BSONCXX_PRIVATE_IF_MSVC(BSONCXX_PRIVATE_PRAGMA(warning(push, 1))); +#include +BSONCXX_PRIVATE_WARNINGS_POP(); -#if defined(__GNUC__) && (__GNUC__ >= 6) && !defined(__clang__) // See https://jira.mongodb.com/browse/CXX-1453 and // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81605 The basic issue // is that GCC sees the visibility attributes on the mongoc functions, // and considers them part of the type, and then emits a silly // diagnostic stating that the attribute was ignored. -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wignored-attributes" +#if defined(__GNUC__) && (__GNUC__ >= 6) && !defined(__clang__) +#define SILENCE_IGNORED_ATTRIBUTES_BEGIN() \ + BSONCXX_PRIVATE_WARNINGS_PUSH(); \ + BSONCXX_PRIVATE_WARNINGS_DISABLE(GCC("-Wignored-attributes")) +#define SILENCE_IGNORED_ATTRIBUTES_END() BSONCXX_PRIVATE_WARNINGS_POP() +#else +#define SILENCE_IGNORED_ATTRIBUTES_BEGIN() +#define SILENCE_IGNORED_ATTRIBUTES_END() +#endif + +#if defined(MONGOC_ENABLE_SSL) +#define MONGOC_SYMBOLS_SSL_XMACRO(X) \ + X(client_pool_set_ssl_opts) \ + X(client_set_ssl_opts) +#else +#define MONGOC_SYMBOLS_SSL_XMACRO(X) #endif -#define MONGOCXX_LIBMONGOC_SYMBOL(name) \ - extern MONGOCXX_ABI_EXPORT_TESTING mongocxx::test_util::mock& name; -#include "libmongoc_symbols.hh" -#undef MONGOCXX_LIBMONGOC_SYMBOL +#pragma push_macro("MONGOC_SYMBOLS_XMACRO") +#define MONGOC_SYMBOLS_XMACRO(X) \ + MONGOC_SYMBOLS_SSL_XMACRO(X) \ + X(apm_callbacks_destroy) \ + X(apm_callbacks_new) \ + X(apm_command_failed_get_command_name) \ + X(apm_command_failed_get_context) \ + X(apm_command_failed_get_duration) \ + X(apm_command_failed_get_error) \ + X(apm_command_failed_get_host) \ + X(apm_command_failed_get_operation_id) \ + X(apm_command_failed_get_reply) \ + X(apm_command_failed_get_request_id) \ + X(apm_command_failed_get_server_id) \ + X(apm_command_failed_get_service_id) \ + X(apm_command_started_get_command_name) \ + X(apm_command_started_get_command) \ + X(apm_command_started_get_context) \ + X(apm_command_started_get_database_name) \ + X(apm_command_started_get_host) \ + X(apm_command_started_get_operation_id) \ + X(apm_command_started_get_request_id) \ + X(apm_command_started_get_server_id) \ + X(apm_command_started_get_service_id) \ + X(apm_command_succeeded_get_command_name) \ + X(apm_command_succeeded_get_context) \ + X(apm_command_succeeded_get_duration) \ + X(apm_command_succeeded_get_host) \ + X(apm_command_succeeded_get_operation_id) \ + X(apm_command_succeeded_get_reply) \ + X(apm_command_succeeded_get_request_id) \ + X(apm_command_succeeded_get_server_id) \ + X(apm_command_succeeded_get_service_id) \ + X(apm_server_changed_get_context) \ + X(apm_server_changed_get_host) \ + X(apm_server_changed_get_new_description) \ + X(apm_server_changed_get_previous_description) \ + X(apm_server_changed_get_topology_id) \ + X(apm_server_closed_get_context) \ + X(apm_server_closed_get_host) \ + X(apm_server_closed_get_topology_id) \ + X(apm_server_heartbeat_failed_get_awaited) \ + X(apm_server_heartbeat_failed_get_context) \ + X(apm_server_heartbeat_failed_get_duration) \ + X(apm_server_heartbeat_failed_get_error) \ + X(apm_server_heartbeat_failed_get_host) \ + X(apm_server_heartbeat_started_get_awaited) \ + X(apm_server_heartbeat_started_get_context) \ + X(apm_server_heartbeat_started_get_host) \ + X(apm_server_heartbeat_succeeded_get_awaited) \ + X(apm_server_heartbeat_succeeded_get_context) \ + X(apm_server_heartbeat_succeeded_get_duration) \ + X(apm_server_heartbeat_succeeded_get_host) \ + X(apm_server_heartbeat_succeeded_get_reply) \ + X(apm_server_opening_get_context) \ + X(apm_server_opening_get_host) \ + X(apm_server_opening_get_topology_id) \ + X(apm_set_command_failed_cb) \ + X(apm_set_command_started_cb) \ + X(apm_set_command_succeeded_cb) \ + X(apm_set_server_changed_cb) \ + X(apm_set_server_closed_cb) \ + X(apm_set_server_heartbeat_failed_cb) \ + X(apm_set_server_heartbeat_started_cb) \ + X(apm_set_server_heartbeat_succeeded_cb) \ + X(apm_set_server_opening_cb) \ + X(apm_set_topology_changed_cb) \ + X(apm_set_topology_closed_cb) \ + X(apm_set_topology_opening_cb) \ + X(apm_topology_changed_get_context) \ + X(apm_topology_changed_get_new_description) \ + X(apm_topology_changed_get_previous_description) \ + X(apm_topology_changed_get_topology_id) \ + X(apm_topology_closed_get_context) \ + X(apm_topology_closed_get_topology_id) \ + X(apm_topology_opening_get_context) \ + X(apm_topology_opening_get_topology_id) \ + X(auto_encryption_opts_destroy) \ + X(auto_encryption_opts_new) \ + X(auto_encryption_opts_set_bypass_auto_encryption) \ + X(auto_encryption_opts_set_bypass_query_analysis) \ + X(auto_encryption_opts_set_encrypted_fields_map) \ + X(auto_encryption_opts_set_extra) \ + X(auto_encryption_opts_set_keyvault_client_pool) \ + X(auto_encryption_opts_set_keyvault_client) \ + X(auto_encryption_opts_set_keyvault_namespace) \ + X(auto_encryption_opts_set_kms_providers) \ + X(auto_encryption_opts_set_schema_map) \ + X(auto_encryption_opts_set_tls_opts) \ + X(bulk_operation_destroy) \ + X(bulk_operation_execute) \ + X(bulk_operation_get_write_concern) \ + X(bulk_operation_insert_with_opts) \ + X(bulk_operation_new) \ + X(bulk_operation_remove_many_with_opts) \ + X(bulk_operation_remove_one_with_opts) \ + X(bulk_operation_replace_one_with_opts) \ + X(bulk_operation_set_bypass_document_validation) \ + X(bulk_operation_set_client_session) \ + X(bulk_operation_set_client) \ + X(bulk_operation_set_collection) \ + X(bulk_operation_set_database) \ + X(bulk_operation_set_write_concern) \ + X(bulk_operation_update_many_with_opts) \ + X(bulk_operation_update_one_with_opts) \ + X(change_stream_destroy) \ + X(change_stream_error_document) \ + X(change_stream_get_resume_token) \ + X(change_stream_next) \ + X(cleanup) \ + X(client_command_simple_with_server_id) \ + X(client_destroy) \ + X(client_enable_auto_encryption) \ + X(client_encryption_add_key_alt_name) \ + X(client_encryption_create_datakey) \ + X(client_encryption_create_encrypted_collection) \ + X(client_encryption_datakey_opts_destroy) \ + X(client_encryption_datakey_opts_new) \ + X(client_encryption_datakey_opts_set_keyaltnames) \ + X(client_encryption_datakey_opts_set_keymaterial) \ + X(client_encryption_datakey_opts_set_masterkey) \ + X(client_encryption_decrypt) \ + X(client_encryption_delete_key) \ + X(client_encryption_destroy) \ + X(client_encryption_encrypt_expression) \ + X(client_encryption_encrypt_opts_destroy) \ + X(client_encryption_encrypt_opts_new) \ + X(client_encryption_encrypt_opts_set_algorithm) \ + X(client_encryption_encrypt_opts_set_contention_factor) \ + X(client_encryption_encrypt_opts_set_keyaltname) \ + X(client_encryption_encrypt_opts_set_keyid) \ + X(client_encryption_encrypt_opts_set_query_type) \ + X(client_encryption_encrypt_opts_set_range_opts) \ + X(client_encryption_encrypt_range_opts_destroy) \ + X(client_encryption_encrypt_range_opts_new) \ + X(client_encryption_encrypt_range_opts_set_max) \ + X(client_encryption_encrypt_range_opts_set_min) \ + X(client_encryption_encrypt_range_opts_set_precision) \ + X(client_encryption_encrypt_range_opts_set_sparsity) \ + X(client_encryption_encrypt_range_opts_set_trim_factor) \ + X(client_encryption_encrypt) \ + X(client_encryption_get_key_by_alt_name) \ + X(client_encryption_get_key) \ + X(client_encryption_get_keys) \ + X(client_encryption_new) \ + X(client_encryption_opts_destroy) \ + X(client_encryption_opts_new) \ + X(client_encryption_opts_set_keyvault_client) \ + X(client_encryption_opts_set_keyvault_namespace) \ + X(client_encryption_opts_set_kms_providers) \ + X(client_encryption_opts_set_tls_opts) \ + X(client_encryption_remove_key_alt_name) \ + X(client_encryption_rewrap_many_datakey_result_destroy) \ + X(client_encryption_rewrap_many_datakey_result_get_bulk_write_result) \ + X(client_encryption_rewrap_many_datakey_result_new) \ + X(client_encryption_rewrap_many_datakey) \ + X(client_find_databases_with_opts) \ + X(client_get_collection) \ + X(client_get_database_names_with_opts) \ + X(client_get_database) \ + X(client_get_read_concern) \ + X(client_get_read_prefs) \ + X(client_get_uri) \ + X(client_get_write_concern) \ + X(client_new_from_uri) \ + X(client_pool_destroy) \ + X(client_pool_enable_auto_encryption) \ + X(client_pool_new_with_error) \ + X(client_pool_new) \ + X(client_pool_pop) \ + X(client_pool_push) \ + X(client_pool_set_apm_callbacks) \ + X(client_pool_set_server_api) \ + X(client_pool_try_pop) \ + X(client_reset) \ + X(client_select_server) \ + X(client_session_abort_transaction) \ + X(client_session_advance_cluster_time) \ + X(client_session_advance_operation_time) \ + X(client_session_append) \ + X(client_session_commit_transaction) \ + X(client_session_destroy) \ + X(client_session_get_cluster_time) \ + X(client_session_get_dirty) \ + X(client_session_get_lsid) \ + X(client_session_get_operation_time) \ + X(client_session_get_opts) \ + X(client_session_get_server_id) \ + X(client_session_get_transaction_state) \ + X(client_session_in_transaction) \ + X(client_session_start_transaction) \ + X(client_session_with_transaction) \ + X(client_set_apm_callbacks) \ + X(client_set_read_concern) \ + X(client_set_read_prefs) \ + X(client_set_server_api) \ + X(client_set_write_concern) \ + X(client_start_session) \ + X(client_watch) \ + X(collection_aggregate) \ + X(collection_command_simple) \ + X(collection_copy) \ + X(collection_count_documents) \ + /* Remove these suppressions when CXX-1594 is done. */ \ + BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_BEGIN \ + X(collection_count_with_opts) \ + BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_END \ + X(collection_create_bulk_operation_with_opts) \ + X(collection_destroy) \ + X(collection_drop_index) \ + X(collection_drop_with_opts) \ + X(collection_drop) \ + X(collection_estimated_document_count) \ + X(collection_find_and_modify_with_opts) \ + X(collection_find_indexes_with_opts) \ + X(collection_find_with_opts) \ + X(collection_get_name) \ + X(collection_get_read_concern) \ + X(collection_get_read_prefs) \ + X(collection_get_write_concern) \ + X(collection_keys_to_index_string) \ + X(collection_read_command_with_opts) \ + X(collection_rename_with_opts) \ + X(collection_rename) \ + X(collection_set_read_concern) \ + X(collection_set_read_prefs) \ + X(collection_set_write_concern) \ + X(collection_watch) \ + X(collection_write_command_with_opts) \ + X(cursor_destroy) \ + X(cursor_error_document) \ + X(cursor_error) \ + X(cursor_new_from_command_reply_with_opts) \ + X(cursor_next) \ + X(cursor_set_max_await_time_ms) \ + X(database_aggregate) \ + X(database_command_with_opts) \ + X(database_copy) \ + X(database_create_collection) \ + X(database_destroy) \ + X(database_drop_with_opts) \ + X(database_drop) \ + X(database_find_collections_with_opts) \ + X(database_get_collection_names_with_opts) \ + X(database_get_collection) \ + X(database_get_read_concern) \ + X(database_get_read_prefs) \ + X(database_get_write_concern) \ + X(database_has_collection) \ + X(database_set_read_concern) \ + X(database_set_read_prefs) \ + X(database_set_write_concern) \ + X(database_watch) \ + X(error_has_label) \ + X(find_and_modify_opts_append) \ + X(find_and_modify_opts_destroy) \ + X(find_and_modify_opts_new) \ + X(find_and_modify_opts_set_bypass_document_validation) \ + X(find_and_modify_opts_set_fields) \ + X(find_and_modify_opts_set_flags) \ + X(find_and_modify_opts_set_max_time_ms) \ + X(find_and_modify_opts_set_sort) \ + X(find_and_modify_opts_set_update) \ + X(handshake_data_append) \ + X(index_opt_geo_init) \ + X(index_opt_init) \ + X(index_opt_wt_init) \ + X(init) \ + /* X(log_set_handler) CDRIVER-5678: not __cdecl. */ \ + X(read_concern_copy) \ + X(read_concern_destroy) \ + X(read_concern_get_level) \ + X(read_concern_new) \ + X(read_concern_set_level) \ + X(read_prefs_copy) \ + X(read_prefs_destroy) \ + X(read_prefs_get_hedge) \ + X(read_prefs_get_max_staleness_seconds) \ + X(read_prefs_get_mode) \ + X(read_prefs_get_tags) \ + X(read_prefs_new) \ + X(read_prefs_set_hedge) \ + X(read_prefs_set_max_staleness_seconds) \ + X(read_prefs_set_mode) \ + X(read_prefs_set_tags) \ + X(server_api_copy) \ + X(server_api_deprecation_errors) \ + X(server_api_destroy) \ + X(server_api_get_deprecation_errors) \ + X(server_api_get_strict) \ + X(server_api_get_version) \ + X(server_api_new) \ + X(server_api_strict) \ + X(server_api_version_from_string) \ + X(server_api_version_to_string) \ + X(server_description_hello_response) \ + X(server_description_host) \ + X(server_description_id) \ + X(server_description_round_trip_time) \ + X(server_description_type) \ + X(server_descriptions_destroy_all) \ + X(session_opts_destroy) \ + X(session_opts_get_causal_consistency) \ + X(session_opts_get_snapshot) \ + X(session_opts_new) \ + X(session_opts_set_causal_consistency) \ + X(session_opts_set_default_transaction_opts) \ + X(session_opts_set_snapshot) \ + X(topology_description_get_servers) \ + X(topology_description_has_readable_server) \ + X(topology_description_has_writable_server) \ + X(topology_description_type) \ + X(transaction_opts_clone) \ + X(transaction_opts_destroy) \ + X(transaction_opts_get_max_commit_time_ms) \ + X(transaction_opts_get_read_concern) \ + X(transaction_opts_get_read_prefs) \ + X(transaction_opts_get_write_concern) \ + X(transaction_opts_new) \ + X(transaction_opts_set_max_commit_time_ms) \ + X(transaction_opts_set_read_concern) \ + X(transaction_opts_set_read_prefs) \ + X(transaction_opts_set_write_concern) \ + X(uri_copy) \ + X(uri_destroy) \ + X(uri_get_auth_mechanism) \ + X(uri_get_auth_source) \ + X(uri_get_compressors) \ + X(uri_get_credentials) \ + X(uri_get_database) \ + X(uri_get_hosts) \ + X(uri_get_option_as_utf8) \ + X(uri_get_options) \ + X(uri_get_password) \ + X(uri_get_read_concern) \ + X(uri_get_read_prefs_t) \ + X(uri_get_replica_set) \ + BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_BEGIN \ + X(uri_get_ssl) \ + BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_END \ + X(uri_get_string) \ + X(uri_get_tls) \ + X(uri_get_username) \ + X(uri_get_write_concern) \ + X(uri_new_with_error) \ + X(write_concern_copy) \ + X(write_concern_destroy) \ + X(write_concern_get_journal) \ + X(write_concern_get_w) \ + X(write_concern_get_wmajority) \ + X(write_concern_get_wtag) \ + X(write_concern_get_wtimeout) \ + X(write_concern_is_acknowledged) \ + X(write_concern_journal_is_set) \ + X(write_concern_new) \ + X(write_concern_set_journal) \ + X(write_concern_set_w) \ + X(write_concern_set_wmajority) \ + X(write_concern_set_wtag) \ + X(write_concern_set_wtimeout) + +namespace mongocxx { +namespace libmongoc { + +#if defined(MONGOCXX_TESTING) + +SILENCE_IGNORED_ATTRIBUTES_BEGIN(); + +#pragma push_macro("X") +#undef X +#define X(name) extern MONGOCXX_ABI_EXPORT_TESTING mongocxx::test_util::mock& name; +MONGOC_SYMBOLS_XMACRO(X) +#pragma pop_macro("X") // CDRIVER-5678 using log_func_cdecl_t = void( @@ -64,20 +431,20 @@ using log_set_handler_cdecl_t = void(MONGOCXX_ABI_CDECL*)(log_func_cdecl_t log_f extern MONGOCXX_ABI_EXPORT_TESTING mongocxx::test_util::mock& log_set_handler; -#if defined(__GNUC__) && (__GNUC__ >= 6) && !defined(__clang__) -#pragma GCC diagnostic pop -#endif +SILENCE_IGNORED_ATTRIBUTES_END(); -#else +#else // defined(MONGOCXX_TESTING) ^|v !defined(MONGOCXX_TESTING) -#define MONGOCXX_LIBMONGOC_SYMBOL(name) constexpr auto name = mongoc_##name; -#include "libmongoc_symbols.hh" -#undef MONGOCXX_LIBMONGOC_SYMBOL +#pragma push_macro("X") +#undef X +#define X(name) constexpr auto name = mongoc_##name; +MONGOC_SYMBOLS_XMACRO(X) +#pragma pop_macro("X") // CDRIVER-5678 constexpr auto log_set_handler = mongoc_log_set_handler; -#endif +#endif // !defined(MONGOCXX_TESTING) } // namespace libmongoc } // namespace mongocxx diff --git a/src/mongocxx/lib/mongocxx/private/pool.hh b/src/mongocxx/lib/mongocxx/private/pool.hh index f785de9f0b..b474ba2d74 100644 --- a/src/mongocxx/lib/mongocxx/private/pool.hh +++ b/src/mongocxx/lib/mongocxx/private/pool.hh @@ -19,7 +19,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/private/read_concern.hh b/src/mongocxx/lib/mongocxx/private/read_concern.hh index 8849b01868..3d646fadbf 100644 --- a/src/mongocxx/lib/mongocxx/private/read_concern.hh +++ b/src/mongocxx/lib/mongocxx/private/read_concern.hh @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/private/read_preference.hh b/src/mongocxx/lib/mongocxx/private/read_preference.hh index 76cd484c52..a976e165c4 100644 --- a/src/mongocxx/lib/mongocxx/private/read_preference.hh +++ b/src/mongocxx/lib/mongocxx/private/read_preference.hh @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/private/search_index_view.hh b/src/mongocxx/lib/mongocxx/private/search_index_view.hh index 28a3585a27..42db01131d 100644 --- a/src/mongocxx/lib/mongocxx/private/search_index_view.hh +++ b/src/mongocxx/lib/mongocxx/private/search_index_view.hh @@ -12,7 +12,7 @@ #include #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/private/uri.hh b/src/mongocxx/lib/mongocxx/private/uri.hh index 19263040db..0bf3e439ad 100644 --- a/src/mongocxx/lib/mongocxx/private/uri.hh +++ b/src/mongocxx/lib/mongocxx/private/uri.hh @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/private/write_concern.hh b/src/mongocxx/lib/mongocxx/private/write_concern.hh index b4bacfe403..d2d7740a3e 100644 --- a/src/mongocxx/lib/mongocxx/private/write_concern.hh +++ b/src/mongocxx/lib/mongocxx/private/write_concern.hh @@ -16,7 +16,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp index 348cf0edbc..50cc51f03d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp index 0077fedffd..e04c81882c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp index 1cf3149ff0..f60fa470ef 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp index 816d4e2ced..dde27328d7 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp index 818cb086fe..a884a15f55 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp index 6e0cd66422..35ffe8d986 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp index c6b9523287..9eee795221 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp index 58dac17546..e3745f741d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp index 82589a6c64..9cb5bb8d16 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp index b251fb0e33..f58b446721 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp index 88601d5220..bbad277174 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp index e41a5898e7..8d8e85fe97 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp index 5ec08cfe6e..645f218060 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp index 23b35f9075..479b59e09b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp index 628897bc60..4259757010 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp index 9d96c5d9b8..f1cc1bb30e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp index 3c1d013dba..f1194ec5ad 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp index 4e410e7d58..4f8be5f82b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp index 1ef3605cdf..5bbca9ce9c 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp index cc2ec51b29..3b0f1c5feb 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh index c970c22c92..f69fe2731d 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh @@ -19,7 +19,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp index 36790fffd0..dff56735a1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #if !defined(__has_feature) #define __has_feature(x) 0 diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp index db53468d90..64cc392adb 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp index 1a4bb9269e..a0e9d735a3 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp index a5081680c4..ea95c44153 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp index 605c763eba..b8cf13fa8b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp index e91c1996d1..2420130f33 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp @@ -20,7 +20,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh index f0c6dbd24d..1a20a4b4ae 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh @@ -18,7 +18,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh index 7507522c76..b6840200da 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh @@ -19,7 +19,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh index 0ccfd17eb3..c75cc5a050 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh @@ -18,7 +18,7 @@ #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp index 8edad6f815..8585ee5573 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp index 28514b5f56..1874ffbced 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp index dc50377f95..129cfc3215 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp @@ -21,7 +21,7 @@ #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp index 43f5ee812b..0d109bee20 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp index 3889ff4e0d..6bd0b60b25 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp index a981e5c24e..0ca7fcb165 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp @@ -24,7 +24,7 @@ #include -#include +#include #include namespace mongocxx { diff --git a/src/mongocxx/test/bulk_write.cpp b/src/mongocxx/test/bulk_write.cpp index 12856966ae..97bd03da7b 100644 --- a/src/mongocxx/test/bulk_write.cpp +++ b/src/mongocxx/test/bulk_write.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include diff --git a/src/mongocxx/test/catch_helpers.hh b/src/mongocxx/test/catch_helpers.hh index 1bb70e0921..4dca3465ee 100644 --- a/src/mongocxx/test/catch_helpers.hh +++ b/src/mongocxx/test/catch_helpers.hh @@ -16,7 +16,7 @@ #include -#include +#include #include diff --git a/src/mongocxx/test/client.cpp b/src/mongocxx/test/client.cpp index 0a2c3fc9cb..c7435e096e 100644 --- a/src/mongocxx/test/client.cpp +++ b/src/mongocxx/test/client.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include diff --git a/src/mongocxx/test/client_helpers.cpp b/src/mongocxx/test/client_helpers.cpp index d2643ffb61..81cf9d11db 100644 --- a/src/mongocxx/test/client_helpers.cpp +++ b/src/mongocxx/test/client_helpers.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include diff --git a/src/mongocxx/test/client_helpers.hh b/src/mongocxx/test/client_helpers.hh index 677142906d..63522a5e6d 100644 --- a/src/mongocxx/test/client_helpers.hh +++ b/src/mongocxx/test/client_helpers.hh @@ -32,7 +32,7 @@ #include #include -#include +#include #include diff --git a/src/mongocxx/test/client_session.cpp b/src/mongocxx/test/client_session.cpp index 5150badcd4..a9579c2d36 100644 --- a/src/mongocxx/test/client_session.cpp +++ b/src/mongocxx/test/client_session.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include diff --git a/src/mongocxx/test/collection.cpp b/src/mongocxx/test/collection.cpp index 20fd55fecf..b05ab3ea0c 100644 --- a/src/mongocxx/test/collection.cpp +++ b/src/mongocxx/test/collection.cpp @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include diff --git a/src/mongocxx/test/collection_mocked.cpp b/src/mongocxx/test/collection_mocked.cpp index dc72f7847c..f3948057df 100644 --- a/src/mongocxx/test/collection_mocked.cpp +++ b/src/mongocxx/test/collection_mocked.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include diff --git a/src/mongocxx/test/database.cpp b/src/mongocxx/test/database.cpp index c3132c6781..14377f4500 100644 --- a/src/mongocxx/test/database.cpp +++ b/src/mongocxx/test/database.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include diff --git a/src/mongocxx/test/logging.cpp b/src/mongocxx/test/logging.cpp index 9bf659093a..904116f6c7 100644 --- a/src/mongocxx/test/logging.cpp +++ b/src/mongocxx/test/logging.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include diff --git a/src/mongocxx/test/pool.cpp b/src/mongocxx/test/pool.cpp index ced3e51353..f6f05e072e 100644 --- a/src/mongocxx/test/pool.cpp +++ b/src/mongocxx/test/pool.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include diff --git a/src/mongocxx/test/private/write_concern.cpp b/src/mongocxx/test/private/write_concern.cpp index 1ffd82aabe..3b19165cba 100644 --- a/src/mongocxx/test/private/write_concern.cpp +++ b/src/mongocxx/test/private/write_concern.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/src/mongocxx/test/spec/operation.hh b/src/mongocxx/test/spec/operation.hh index 313ddc5c77..58da3101cd 100644 --- a/src/mongocxx/test/spec/operation.hh +++ b/src/mongocxx/test/spec/operation.hh @@ -23,7 +23,7 @@ #include #include -#include +#include namespace mongocxx { namespace spec { From e4c7a7faf137df0d102bb67393d36f9ddb05e25a Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 30 Jan 2025 13:57:30 -0600 Subject: [PATCH 14/22] Fix warning suppression macros in internal C Driver library headers --- src/bsoncxx/lib/bsoncxx/private/bson.hh | 10 ++-------- src/mongocxx/lib/mongocxx/private/mongoc.hh | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/bsoncxx/lib/bsoncxx/private/bson.hh b/src/bsoncxx/lib/bsoncxx/private/bson.hh index 3507bb69b1..8bda5471a4 100644 --- a/src/bsoncxx/lib/bsoncxx/private/bson.hh +++ b/src/bsoncxx/lib/bsoncxx/private/bson.hh @@ -18,14 +18,8 @@ BSONCXX_PRIVATE_WARNINGS_PUSH(); -BSONCXX_PRIVATE_WARNINGS_DISABLE(GCC()); -BSONCXX_PRIVATE_WARNINGS_DISABLE(GCC("-Wall")); -BSONCXX_PRIVATE_WARNINGS_DISABLE(GCC("-Wextra")); -BSONCXX_PRIVATE_WARNINGS_DISABLE(GCC("-Wconversion")); - -BSONCXX_PRIVATE_WARNINGS_DISABLE(Clang("-Weverything")); - -BSONCXX_PRIVATE_IF_MSVC(BSONCXX_PRIVATE_PRAGMA(warning(push, 1))); +BSONCXX_PRIVATE_WARNINGS_DISABLE(GNU("-Wconversion")); +BSONCXX_PRIVATE_IF_MSVC(BSONCXX_PRIVATE_PRAGMA(warning(push, 1));) #include diff --git a/src/mongocxx/lib/mongocxx/private/mongoc.hh b/src/mongocxx/lib/mongocxx/private/mongoc.hh index 99a3ccdcdd..9e09525f77 100644 --- a/src/mongocxx/lib/mongocxx/private/mongoc.hh +++ b/src/mongocxx/lib/mongocxx/private/mongoc.hh @@ -22,8 +22,8 @@ #include BSONCXX_PRIVATE_WARNINGS_PUSH(); -BSONCXX_PRIVATE_WARNINGS_DISABLE(GNU("-Wconversion")) -BSONCXX_PRIVATE_IF_MSVC(BSONCXX_PRIVATE_PRAGMA(warning(push, 1))); +BSONCXX_PRIVATE_WARNINGS_DISABLE(GNU("-Wconversion")); +BSONCXX_PRIVATE_IF_MSVC(BSONCXX_PRIVATE_PRAGMA(warning(push, 1));) #include BSONCXX_PRIVATE_WARNINGS_POP(); From c505b96a89cfdfdc63f4a0fe2b9539a48b76c518 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 30 Jan 2025 15:38:57 -0600 Subject: [PATCH 15/22] format: remove private config headers from regex --- .clang-format | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index ba498c4985..fccfb9d209 100644 --- a/.clang-format +++ b/.clang-format @@ -160,9 +160,9 @@ IncludeCategories: Priority: 26 - Regex: 'mongocxx/v1/.*\.hh' # v1 private headers Priority: 27 - - Regex: 'bsoncxx/config(/private)?/prelude\.(hpp|hh)' # v_noabi preludes + - Regex: 'bsoncxx/config/prelude\.(hpp|hh)' # v_noabi preludes Priority: 62 - - Regex: 'mongocxx/config(/private)?/prelude\.(hpp|hh)' # v_noabi preludes + - Regex: 'mongocxx/config/prelude\.(hpp|hh)' # v_noabi preludes Priority: 63 - Regex: 'bsoncxx/private/.*' # private headers Priority: 60 From f4ff4e7f094c534aac7407f8f5b4ea141b0f4a4b Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Tue, 4 Feb 2025 11:28:29 -0600 Subject: [PATCH 16/22] v_noabi: relocate private headers --- .../lib/bsoncxx/{v_noabi/bsoncxx/types => }/private/convert.hh | 0 .../{v_noabi/mongocxx/exception => }/private/mongoc_error.hh | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/bsoncxx/lib/bsoncxx/{v_noabi/bsoncxx/types => }/private/convert.hh (100%) rename src/mongocxx/lib/mongocxx/{v_noabi/mongocxx/exception => }/private/mongoc_error.hh (100%) diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh b/src/bsoncxx/lib/bsoncxx/private/convert.hh similarity index 100% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh rename to src/bsoncxx/lib/bsoncxx/private/convert.hh diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh b/src/mongocxx/lib/mongocxx/private/mongoc_error.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh rename to src/mongocxx/lib/mongocxx/private/mongoc_error.hh From 09e13d0b06b38a20e8f5a8ea57959d6b2cc4d647 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Tue, 4 Feb 2025 11:28:30 -0600 Subject: [PATCH 17/22] v_noabi: relocate component headers --- .../v_noabi/bsoncxx/types/bson_value/{private => }/value.hh | 0 .../lib/mongocxx/v_noabi/mongocxx/gridfs/{private => }/bucket.hh | 0 .../mongocxx/v_noabi/mongocxx/gridfs/{private => }/downloader.hh | 0 .../mongocxx/v_noabi/mongocxx/gridfs/{private => }/uploader.hh | 0 .../lib/mongocxx/v_noabi/mongocxx/options/{private => }/apm.hh | 0 .../mongocxx/v_noabi/mongocxx/options/{private => }/server_api.hh | 0 .../mongocxx/v_noabi/mongocxx/options/{private/ssl.hh => tls.hh} | 0 .../v_noabi/mongocxx/options/{private => }/transaction.hh | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/{private => }/value.hh (100%) rename src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/{private => }/bucket.hh (100%) rename src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/{private => }/downloader.hh (100%) rename src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/{private => }/uploader.hh (100%) rename src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/{private => }/apm.hh (100%) rename src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/{private => }/server_api.hh (100%) rename src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/{private/ssl.hh => tls.hh} (100%) rename src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/{private => }/transaction.hh (100%) diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hh similarity index 100% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hh diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.hh diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.hh diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.hh diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.hh diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.hh diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.hh diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.hh similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.hh From b1b49ae869da056a442758dd2d6844968bb7e867 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Tue, 4 Feb 2025 11:28:31 -0600 Subject: [PATCH 18/22] v_noabi: update paths --- src/bsoncxx/lib/CMakeLists.txt | 4 ++-- .../v_noabi/bsoncxx/types/bson_value/value.cpp | 8 +++++--- .../v_noabi/bsoncxx/types/bson_value/value.hh | 3 +++ .../v_noabi/bsoncxx/types/bson_value/view.cpp | 2 +- src/mongocxx/lib/CMakeLists.txt | 16 ++++++++-------- .../lib/mongocxx/private/change_stream.hh | 2 +- .../lib/mongocxx/private/client_encryption.hh | 7 +++---- .../lib/mongocxx/private/client_session.hh | 4 ++-- .../lib/mongocxx/private/scoped_bson_value.hh | 3 ++- .../lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp | 2 +- .../lib/mongocxx/v_noabi/mongocxx/client.cpp | 8 ++++---- .../mongocxx/v_noabi/mongocxx/client_session.cpp | 2 +- .../lib/mongocxx/v_noabi/mongocxx/collection.cpp | 2 +- .../lib/mongocxx/v_noabi/mongocxx/cursor.cpp | 2 +- .../lib/mongocxx/v_noabi/mongocxx/database.cpp | 2 +- .../mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp | 2 +- .../mongocxx/v_noabi/mongocxx/gridfs/bucket.hh | 5 ++++- .../v_noabi/mongocxx/gridfs/downloader.cpp | 6 ++++-- .../v_noabi/mongocxx/gridfs/downloader.hh | 5 ++++- .../v_noabi/mongocxx/gridfs/uploader.cpp | 6 ++++-- .../mongocxx/v_noabi/mongocxx/gridfs/uploader.hh | 6 ++++-- .../lib/mongocxx/v_noabi/mongocxx/index_view.cpp | 2 +- .../lib/mongocxx/v_noabi/mongocxx/options/apm.hh | 6 ++++-- .../v_noabi/mongocxx/options/encrypt.cpp | 4 ++-- .../mongocxx/options/rewrap_many_datakey.cpp | 4 ++-- .../v_noabi/mongocxx/options/server_api.cpp | 5 ++++- .../v_noabi/mongocxx/options/server_api.hh | 5 ++++- .../lib/mongocxx/v_noabi/mongocxx/options/tls.hh | 6 ++++-- .../v_noabi/mongocxx/options/transaction.cpp | 5 ++++- .../v_noabi/mongocxx/options/transaction.hh | 4 ++++ .../lib/mongocxx/v_noabi/mongocxx/pool.cpp | 8 ++++---- 31 files changed, 90 insertions(+), 56 deletions(-) diff --git a/src/bsoncxx/lib/CMakeLists.txt b/src/bsoncxx/lib/CMakeLists.txt index 325365eef9..60af6169ff 100644 --- a/src/bsoncxx/lib/CMakeLists.txt +++ b/src/bsoncxx/lib/CMakeLists.txt @@ -90,6 +90,7 @@ set_dist_list(src_bsoncxx_lib_DIST ${bsoncxx_sources_v1} bsoncxx/private/b64_ntop.hh bsoncxx/private/config/config.hh.in + bsoncxx/private/convert.hh bsoncxx/private/export.hh bsoncxx/private/helpers.hh bsoncxx/private/itoa.hh @@ -97,8 +98,7 @@ set_dist_list(src_bsoncxx_lib_DIST bsoncxx/private/make_unique.hh bsoncxx/private/stack.hh bsoncxx/private/suppress_deprecation_warnings.hh - bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh - bsoncxx/v_noabi/bsoncxx/types/private/convert.hh + bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hh bsoncxx/v1/config/config.hpp.in bsoncxx/v1/config/version.hpp.in ) diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp index af2d1f583f..2f4b67a4c8 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp @@ -12,12 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + +// + #include #include -#include -#include -#include +#include #include namespace bsoncxx { diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hh index 182ec5dfed..b9af7b4fda 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hh +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hh @@ -15,6 +15,9 @@ #pragma once #include + +// + #include #include diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp index 7f5115336b..55793ee25c 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp @@ -17,9 +17,9 @@ #include #include #include -#include #include +#include #include #define BSONCXX_CITER \ diff --git a/src/mongocxx/lib/CMakeLists.txt b/src/mongocxx/lib/CMakeLists.txt index 404c72e043..5205f9fc4a 100644 --- a/src/mongocxx/lib/CMakeLists.txt +++ b/src/mongocxx/lib/CMakeLists.txt @@ -196,6 +196,7 @@ set_dist_list(src_mongocxx_lib_DIST mongocxx/private/export.hh mongocxx/private/index_view.hh mongocxx/private/mock.hh + mongocxx/private/mongoc_error.hh mongocxx/private/mongoc.hh mongocxx/private/numeric_casting.hh mongocxx/private/pipeline.hh @@ -207,14 +208,13 @@ set_dist_list(src_mongocxx_lib_DIST mongocxx/private/search_index_view.hh mongocxx/private/uri.hh mongocxx/private/write_concern.hh - mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh - mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh - mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh - mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh - mongocxx/v_noabi/mongocxx/options/private/apm.hh - mongocxx/v_noabi/mongocxx/options/private/server_api.hh - mongocxx/v_noabi/mongocxx/options/private/ssl.hh - mongocxx/v_noabi/mongocxx/options/private/transaction.hh + mongocxx/v_noabi/mongocxx/gridfs/bucket.hh + mongocxx/v_noabi/mongocxx/gridfs/downloader.hh + mongocxx/v_noabi/mongocxx/gridfs/uploader.hh + mongocxx/v_noabi/mongocxx/options/apm.hh + mongocxx/v_noabi/mongocxx/options/server_api.hh + mongocxx/v_noabi/mongocxx/options/tls.hh + mongocxx/v_noabi/mongocxx/options/transaction.hh mongocxx/v1/config/config.hpp.in mongocxx/v1/config/version.hpp.in ) diff --git a/src/mongocxx/lib/mongocxx/private/change_stream.hh b/src/mongocxx/lib/mongocxx/private/change_stream.hh index f8f91a1f2f..334e8d6107 100644 --- a/src/mongocxx/lib/mongocxx/private/change_stream.hh +++ b/src/mongocxx/lib/mongocxx/private/change_stream.hh @@ -18,11 +18,11 @@ #include #include -#include #include #include #include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/private/client_encryption.hh b/src/mongocxx/lib/mongocxx/private/client_encryption.hh index f7ac8757bb..41b59cfc13 100644 --- a/src/mongocxx/lib/mongocxx/private/client_encryption.hh +++ b/src/mongocxx/lib/mongocxx/private/client_encryption.hh @@ -17,25 +17,24 @@ #include #include -#include -#include +#include #include -#include #include #include #include -#include #include #include #include +#include #include #include #include #include #include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/private/client_session.hh b/src/mongocxx/lib/mongocxx/private/client_session.hh index 2462c55004..3353c3538a 100644 --- a/src/mongocxx/lib/mongocxx/private/client_session.hh +++ b/src/mongocxx/lib/mongocxx/private/client_session.hh @@ -22,8 +22,7 @@ #include #include #include -#include -#include +#include #include #include @@ -31,6 +30,7 @@ #include #include #include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/private/scoped_bson_value.hh b/src/mongocxx/lib/mongocxx/private/scoped_bson_value.hh index 6f647e0688..07697f779d 100644 --- a/src/mongocxx/lib/mongocxx/private/scoped_bson_value.hh +++ b/src/mongocxx/lib/mongocxx/private/scoped_bson_value.hh @@ -17,7 +17,8 @@ #include #include -#include + +#include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp index 50cc51f03d..327286adda 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include @@ -28,6 +27,7 @@ #include #include #include +#include #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp index d2062aede9..9cf941b4c1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp @@ -18,17 +18,17 @@ #include #include #include -#include +#include #include -#include -#include -#include +#include +#include #include #include #include #include +#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp index 39b83edd1d..d8f911618a 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp @@ -13,12 +13,12 @@ // limitations under the License. #include -#include #include #include #include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp index f60fa470ef..c5f23b60e8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -55,6 +54,7 @@ #include #include #include +#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp index dde27328d7..0e505c72bc 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp @@ -13,7 +13,6 @@ // limitations under the License. #include -#include #include #include @@ -21,6 +20,7 @@ #include #include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp index a884a15f55..c2bd95e964 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include @@ -33,6 +32,7 @@ #include #include #include +#include #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp index 65915362e5..ed702c91fc 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp @@ -27,8 +27,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.hh index 55521e83c1..a7ce56b1f2 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.hh @@ -14,11 +14,14 @@ #pragma once +#include + +// + #include #include #include -#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp index 630b3e06ee..be4a49fdac 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + +// + #include #include #include @@ -21,8 +25,6 @@ #include #include -#include -#include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.hh index 52d30483ab..9b9bf2e2d9 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.hh @@ -14,12 +14,15 @@ #pragma once +#include + +// + #include #include #include #include -#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp index 1e59b991dd..0f97933fdd 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + +// + #include #include #include @@ -24,8 +28,6 @@ #include #include #include -#include -#include namespace { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.hh index 3adfff3c3f..248cdbbfa9 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.hh @@ -14,13 +14,15 @@ #pragma once +#include + +// + #include #include #include -#include - #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp index d611166bf8..e4ca7b3ac7 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp @@ -15,13 +15,13 @@ #include #include -#include #include #include #include #include +#include namespace mongocxx { namespace v_noabi { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.hh index 1a20a4b4ae..eb8f853b29 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.hh @@ -14,10 +14,12 @@ #pragma once -#include - #include +// + +#include + #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp index b8cf13fa8b..b686419e81 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp @@ -14,12 +14,12 @@ #include -#include - #include #include #include +#include + #include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp index 8585ee5573..7523bfbae0 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include #include #include +#include + #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp index 1874ffbced..934723033e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp @@ -12,13 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + +// + #include #include #include #include -#include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.hh index b6840200da..91b55e7f31 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.hh @@ -14,10 +14,13 @@ #pragma once +#include + +// + #include #include #include -#include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.hh index c75cc5a050..0324d0a63b 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.hh @@ -14,10 +14,12 @@ #pragma once -#include - #include +// + +#include + #include namespace mongocxx { diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp index 5379d65dd3..aa19b18110 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp @@ -12,9 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + +// + #include #include -#include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.hh index a08c717ffc..c9c7d9aa80 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.hh @@ -14,6 +14,10 @@ #pragma once +#include + +// + #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp index c014faefb5..e23f78932e 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp @@ -18,15 +18,15 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include #include #include #include +#include #include #include From 4c5760dad8a9dc0220b377684c0461914571eaf5 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Tue, 4 Feb 2025 11:28:31 -0600 Subject: [PATCH 19/22] format: separate public and internal v_noabi headers --- .clang-format | 12 ++++++++---- .../lib/mongocxx/private/client_encryption.hh | 3 ++- src/mongocxx/lib/mongocxx/private/client_session.hh | 1 + .../lib/mongocxx/v_noabi/mongocxx/client.cpp | 3 ++- .../lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp | 3 ++- src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp | 3 ++- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.clang-format b/.clang-format index fccfb9d209..10c1504af3 100644 --- a/.clang-format +++ b/.clang-format @@ -156,9 +156,9 @@ IncludeCategories: Priority: 24 - Regex: 'mongocxx/v1/.*\.hpp' # v1 public headers Priority: 25 - - Regex: 'bsoncxx/v1/.*\.hh' # v1 private headers + - Regex: 'bsoncxx/v1/.*\.hh' # v1 internal headers Priority: 26 - - Regex: 'mongocxx/v1/.*\.hh' # v1 private headers + - Regex: 'mongocxx/v1/.*\.hh' # v1 internal headers Priority: 27 - Regex: 'bsoncxx/config/prelude\.(hpp|hh)' # v_noabi preludes Priority: 62 @@ -178,10 +178,14 @@ IncludeCategories: Priority: 40 - Regex: 'mongocxx/.*(-|\/)fwd\.(hpp|hh)' # all remaining forward headers Priority: 41 - - Regex: 'bsoncxx/.*' # all remaining headers + - Regex: 'bsoncxx/.*\.hpp' # all remaining public headers Priority: 50 - - Regex: 'mongocxx/.*' # all remaining headers + - Regex: 'mongocxx/.*\.hpp' # all remaining public headers Priority: 51 + - Regex: 'bsoncxx/.*\.hh' # all remaining internal headers + Priority: 52 + - Regex: 'mongocxx/.*\.hh' # all remaining internal headers + Priority: 53 - Regex: '.*' # all other headers (third party) Priority: 90 IncludeIsMainRegex: '([-_](test|unittest))?$' diff --git a/src/mongocxx/lib/mongocxx/private/client_encryption.hh b/src/mongocxx/lib/mongocxx/private/client_encryption.hh index 41b59cfc13..4326403137 100644 --- a/src/mongocxx/lib/mongocxx/private/client_encryption.hh +++ b/src/mongocxx/lib/mongocxx/private/client_encryption.hh @@ -17,7 +17,6 @@ #include #include -#include #include #include @@ -26,6 +25,8 @@ #include #include +#include + #include #include #include diff --git a/src/mongocxx/lib/mongocxx/private/client_session.hh b/src/mongocxx/lib/mongocxx/private/client_session.hh index 3353c3538a..f12442c2a4 100644 --- a/src/mongocxx/lib/mongocxx/private/client_session.hh +++ b/src/mongocxx/lib/mongocxx/private/client_session.hh @@ -22,6 +22,7 @@ #include #include #include + #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp index 9cf941b4c1..7bc5d43418 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp @@ -18,8 +18,9 @@ #include #include #include -#include #include + +#include #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp index ed702c91fc..906b1af6e8 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp @@ -27,11 +27,12 @@ #include #include #include -#include #include #include #include +#include + #include #include diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp index e23f78932e..76d70b12a5 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp @@ -18,10 +18,11 @@ #include #include #include +#include + #include #include #include -#include #include From 696e8db4b35c78164d5bb40da81deb118add1b2e Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Wed, 12 Feb 2025 13:43:04 -0600 Subject: [PATCH 20/22] Remove redundant if(1) block --- src/bsoncxx/lib/CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/bsoncxx/lib/CMakeLists.txt b/src/bsoncxx/lib/CMakeLists.txt index 60af6169ff..02a5c2f8c2 100644 --- a/src/bsoncxx/lib/CMakeLists.txt +++ b/src/bsoncxx/lib/CMakeLists.txt @@ -56,12 +56,10 @@ list(TRANSFORM bsoncxx_sources PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/") set(bsoncxx_sources "${bsoncxx_sources}" PARENT_SCOPE) # Generate private headers. -if(1) - configure_file( - bsoncxx/private/config/config.hh.in - bsoncxx/private/config/config.hh - ) -endif() +configure_file( + bsoncxx/private/config/config.hh.in + bsoncxx/private/config/config.hh +) # Generate and install public headers. if(1) From beba4a02c7ef2ef4c253b34659a69cef6d83fe42 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Wed, 12 Feb 2025 13:43:04 -0600 Subject: [PATCH 21/22] Reorder Priority 60 include categories in order of priority --- .clang-format | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.clang-format b/.clang-format index 10c1504af3..302198f61c 100644 --- a/.clang-format +++ b/.clang-format @@ -160,14 +160,14 @@ IncludeCategories: Priority: 26 - Regex: 'mongocxx/v1/.*\.hh' # v1 internal headers Priority: 27 - - Regex: 'bsoncxx/config/prelude\.(hpp|hh)' # v_noabi preludes - Priority: 62 - - Regex: 'mongocxx/config/prelude\.(hpp|hh)' # v_noabi preludes - Priority: 63 - Regex: 'bsoncxx/private/.*' # private headers Priority: 60 - Regex: 'mongocxx/private/.*' # private headers Priority: 61 + - Regex: 'bsoncxx/config/prelude\.(hpp|hh)' # v_noabi preludes + Priority: 62 + - Regex: 'mongocxx/config/prelude\.(hpp|hh)' # v_noabi preludes + Priority: 63 - Regex: 'bsoncxx/test/.*' # test headers Priority: 70 - Regex: 'mongocxx/test/.*' # test headers From f28d1aed3c602616acfc2af708cb7a2f8dfca809 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Wed, 12 Feb 2025 13:54:58 -0600 Subject: [PATCH 22/22] Fix -Wconversion errors due to incorrect merge conflict resolution --- src/bsoncxx/lib/bsoncxx/private/itoa.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bsoncxx/lib/bsoncxx/private/itoa.cpp b/src/bsoncxx/lib/bsoncxx/private/itoa.cpp index 183deb8804..fa6bc04d11 100644 --- a/src/bsoncxx/lib/bsoncxx/private/itoa.cpp +++ b/src/bsoncxx/lib/bsoncxx/private/itoa.cpp @@ -1050,7 +1050,7 @@ void itoa::_init() { while (_val > 0u) { i--; - _buf[i] = static_cast(_val % 10u) + '0'; + _buf[i] = static_cast((_val % 10u) + '0'); _val = _val / 10u; }