Skip to content

Commit d29bad7

Browse files
eramongodberamongodb
authored
CXX-3320 Relocate v_noabi internal headers into v_noabi directory (#1493)
1 parent 9154447 commit d29bad7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+200
-194
lines changed

‎src/mongocxx/lib/CMakeLists.txt‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# limitations under the License.
1414

1515
set(mongocxx_sources_private
16-
mongocxx/private/conversions.cpp
1716
mongocxx/private/mongoc.cpp
1817
mongocxx/private/numeric_casting.cpp
1918
mongocxx/private/scoped_bson.cpp
@@ -29,6 +28,7 @@ set(mongocxx_sources_v_noabi
2928
mongocxx/v_noabi/mongocxx/config/config.cpp
3029
mongocxx/v_noabi/mongocxx/config/export.cpp
3130
mongocxx/v_noabi/mongocxx/config/version.cpp
31+
mongocxx/v_noabi/mongocxx/conversions.cpp
3232
mongocxx/v_noabi/mongocxx/cursor.cpp
3333
mongocxx/v_noabi/mongocxx/database.cpp
3434
mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp
@@ -254,42 +254,42 @@ set_dist_list(src_mongocxx_lib_DIST
254254
${mongocxx_sources_private}
255255
${mongocxx_sources_v_noabi}
256256
${mongocxx_sources_v1}
257-
mongocxx/private/append_aggregate_options.hh
258-
mongocxx/private/bulk_write.hh
259-
mongocxx/private/change_stream.hh
260-
mongocxx/private/client_encryption.hh
261-
mongocxx/private/client_session.hh
262-
mongocxx/private/client.hh
263-
mongocxx/private/collection.hh
264257
mongocxx/private/config/config.hh.in
265-
mongocxx/private/conversions.hh
266-
mongocxx/private/cursor.hh
267-
mongocxx/private/database.hh
268258
mongocxx/private/export.hh
269-
mongocxx/private/index_view.hh
270259
mongocxx/private/mock.hh
271-
mongocxx/private/mongoc_error.hh
272260
mongocxx/private/mongoc.hh
273261
mongocxx/private/numeric_casting.hh
274-
mongocxx/private/pipeline.hh
275-
mongocxx/private/pool.hh
276-
mongocxx/private/read_concern.hh
277-
mongocxx/private/read_preference.hh
278262
mongocxx/private/scoped_bson_value.hh
279263
mongocxx/private/scoped_bson.hh
280-
mongocxx/private/search_index_model.hh
281-
mongocxx/private/search_index_view.hh
282264
mongocxx/private/ssl.hh
283-
mongocxx/private/uri.hh
284-
mongocxx/private/write_concern.hh
265+
mongocxx/v_noabi/mongocxx/append_aggregate_options.hh
266+
mongocxx/v_noabi/mongocxx/bulk_write.hh
267+
mongocxx/v_noabi/mongocxx/change_stream.hh
268+
mongocxx/v_noabi/mongocxx/client_encryption.hh
269+
mongocxx/v_noabi/mongocxx/client_session.hh
270+
mongocxx/v_noabi/mongocxx/client.hh
271+
mongocxx/v_noabi/mongocxx/collection.hh
272+
mongocxx/v_noabi/mongocxx/conversions.hh
273+
mongocxx/v_noabi/mongocxx/cursor.hh
274+
mongocxx/v_noabi/mongocxx/database.hh
285275
mongocxx/v_noabi/mongocxx/gridfs/bucket.hh
286276
mongocxx/v_noabi/mongocxx/gridfs/downloader.hh
287277
mongocxx/v_noabi/mongocxx/gridfs/uploader.hh
278+
mongocxx/v_noabi/mongocxx/index_view.hh
279+
mongocxx/v_noabi/mongocxx/mongoc_error.hh
288280
mongocxx/v_noabi/mongocxx/options/apm.hh
289281
mongocxx/v_noabi/mongocxx/options/server_api.hh
290282
mongocxx/v_noabi/mongocxx/options/tls.hh
291283
mongocxx/v_noabi/mongocxx/options/transaction.hh
284+
mongocxx/v_noabi/mongocxx/pipeline.hh
285+
mongocxx/v_noabi/mongocxx/pool.hh
286+
mongocxx/v_noabi/mongocxx/read_concern.hh
287+
mongocxx/v_noabi/mongocxx/read_preference.hh
292288
mongocxx/v_noabi/mongocxx/scoped_bson.hh
289+
mongocxx/v_noabi/mongocxx/search_index_model.hh
290+
mongocxx/v_noabi/mongocxx/search_index_view.hh
291+
mongocxx/v_noabi/mongocxx/uri.hh
292+
mongocxx/v_noabi/mongocxx/write_concern.hh
293293
mongocxx/v1/config/config.hpp.in
294294
mongocxx/v1/config/version.hpp.in
295295
)

‎src/mongocxx/lib/mongocxx/private/append_aggregate_options.hh‎ renamed to ‎src/mongocxx/lib/mongocxx/v_noabi/mongocxx/append_aggregate_options.hh‎

File renamed without changes.

‎src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
#include <mongocxx/exception/bulk_write_exception.hpp>
2121
#include <mongocxx/exception/logic_error.hpp>
2222

23+
#include <mongocxx/bulk_write.hh>
24+
#include <mongocxx/client_session.hh>
25+
#include <mongocxx/collection.hh>
26+
#include <mongocxx/mongoc_error.hh>
2327
#include <mongocxx/scoped_bson.hh>
28+
#include <mongocxx/write_concern.hh>
2429

2530
#include <bsoncxx/private/make_unique.hh>
2631

27-
#include <mongocxx/private/bulk_write.hh>
28-
#include <mongocxx/private/client_session.hh>
29-
#include <mongocxx/private/collection.hh>
3032
#include <mongocxx/private/mongoc.hh>
31-
#include <mongocxx/private/mongoc_error.hh>
32-
#include <mongocxx/private/write_concern.hh>
3333

3434
namespace mongocxx {
3535
namespace v_noabi {

‎src/mongocxx/lib/mongocxx/private/bulk_write.hh‎ renamed to ‎src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.hh‎

File renamed without changes.

‎src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616

1717
#include <mongocxx/change_stream.hpp>
1818

19+
#include <mongocxx/change_stream.hh>
20+
1921
#include <bsoncxx/private/make_unique.hh>
2022

21-
#include <mongocxx/private/change_stream.hh>
2223
#include <mongocxx/private/mongoc.hh>
2324

2425
namespace mongocxx {

‎src/mongocxx/lib/mongocxx/private/change_stream.hh‎ renamed to ‎src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.hh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <mongocxx/scoped_bson.hh>
2424

2525
#include <mongocxx/private/mongoc.hh>
26-
#include <mongocxx/private/mongoc_error.hh>
26+
#include <mongocxx/mongoc_error.hh>
2727

2828
namespace mongocxx {
2929
namespace v_noabi {

‎src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@
2020
#include <mongocxx/exception/operation_exception.hpp>
2121
#include <mongocxx/options/auto_encryption.hpp>
2222

23+
#include <mongocxx/client.hh>
24+
#include <mongocxx/client_session.hh>
25+
#include <mongocxx/mongoc_error.hh>
2326
#include <mongocxx/options/apm.hh>
2427
#include <mongocxx/options/server_api.hh>
2528
#include <mongocxx/options/tls.hh>
29+
#include <mongocxx/pipeline.hh>
30+
#include <mongocxx/read_concern.hh>
31+
#include <mongocxx/read_preference.hh>
2632
#include <mongocxx/scoped_bson.hh>
33+
#include <mongocxx/uri.hh>
34+
#include <mongocxx/write_concern.hh>
2735

2836
#include <bsoncxx/private/make_unique.hh>
2937

30-
#include <mongocxx/private/client.hh>
31-
#include <mongocxx/private/client_session.hh>
32-
#include <mongocxx/private/mongoc_error.hh>
33-
#include <mongocxx/private/pipeline.hh>
34-
#include <mongocxx/private/read_concern.hh>
35-
#include <mongocxx/private/read_preference.hh>
3638
#include <mongocxx/private/ssl.hh>
37-
#include <mongocxx/private/uri.hh>
38-
#include <mongocxx/private/write_concern.hh>
3939

4040
namespace mongocxx {
4141
namespace v_noabi {

‎src/mongocxx/lib/mongocxx/private/client.hh‎ renamed to ‎src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.hh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <mongocxx/client.hpp>
2020

2121
#include <mongocxx/private/mongoc.hh>
22-
#include <mongocxx/private/write_concern.hh>
22+
#include <mongocxx/write_concern.hh>
2323

2424
namespace mongocxx {
2525
namespace v_noabi {

‎src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
#include <mongocxx/client_encryption.hpp>
1616

17-
#include <bsoncxx/private/make_unique.hh>
17+
#include <mongocxx/client_encryption.hh>
18+
#include <mongocxx/database.hh>
1819

19-
#include <mongocxx/private/client_encryption.hh>
20-
#include <mongocxx/private/database.hh>
20+
#include <bsoncxx/private/make_unique.hh>
2121

2222
namespace mongocxx {
2323
namespace v_noabi {

‎src/mongocxx/lib/mongocxx/private/client_encryption.hh‎ renamed to ‎src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.hh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
#include <bsoncxx/private/bson.hh>
3131
#include <bsoncxx/private/helpers.hh>
3232

33-
#include <mongocxx/private/client.hh>
34-
#include <mongocxx/private/cursor.hh>
33+
#include <mongocxx/client.hh>
34+
#include <mongocxx/cursor.hh>
3535
#include <mongocxx/private/mongoc.hh>
36-
#include <mongocxx/private/mongoc_error.hh>
36+
#include <mongocxx/mongoc_error.hh>
3737
#include <mongocxx/private/scoped_bson_value.hh>
3838

3939
namespace mongocxx {

0 commit comments

Comments
 (0)