Skip to content

Commit 9096a30

Browse files
eramongodberamongodb
committed
Relocate internal components out of v_noabi subdirectories
1 parent 629d262 commit 9096a30

File tree

177 files changed

+278
-268
lines changed

Some content is hidden

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

177 files changed

+278
-268
lines changed

‎.clang-format

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ IncludeCategories:
164164
Priority: 28
165165
- Regex: 'mongocxx/v1/.*\.hh' # v1 private headers
166166
Priority: 29
167-
- Regex: 'bsoncxx/config(/private)?/prelude\.(hpp|hh)' # v_noabi preludes
167+
- Regex: 'bsoncxx/(private/)?config/prelude\.(hpp|hh)' # v_noabi preludes
168168
Priority: 60
169-
- Regex: 'mongocxx/config(/private)?/prelude\.(hpp|hh)' # v_noabi preludes
169+
- Regex: 'mongocxx/(private/)?config/prelude\.(hpp|hh)' # v_noabi preludes
170170
Priority: 61
171171
- Regex: 'bsoncxx/test/.*' # test headers
172172
Priority: 70

‎src/bsoncxx/lib/CMakeLists.txt

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
set(bsoncxx_sources_private
16+
bsoncxx/private/itoa.cpp
17+
)
18+
1519
set(bsoncxx_sources_v_noabi
1620
bsoncxx/v_noabi/bsoncxx/array/element.cpp
1721
bsoncxx/v_noabi/bsoncxx/array/value.cpp
@@ -28,7 +32,6 @@ set(bsoncxx_sources_v_noabi
2832
bsoncxx/v_noabi/bsoncxx/exception/exception.cpp
2933
bsoncxx/v_noabi/bsoncxx/json.cpp
3034
bsoncxx/v_noabi/bsoncxx/oid.cpp
31-
bsoncxx/v_noabi/bsoncxx/private/itoa.cpp
3235
bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp
3336
bsoncxx/v_noabi/bsoncxx/types.cpp
3437
bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp
@@ -45,6 +48,7 @@ set(bsoncxx_sources_v1
4548
)
4649

4750
list(APPEND bsoncxx_sources
51+
${bsoncxx_sources_private}
4852
${bsoncxx_sources_v_noabi}
4953
${bsoncxx_sources_v1}
5054
)
@@ -54,8 +58,8 @@ set(bsoncxx_sources "${bsoncxx_sources}" PARENT_SCOPE)
5458
# Generate private headers.
5559
if(1)
5660
configure_file(
57-
bsoncxx/v_noabi/bsoncxx/config/private/config.hh.in
58-
bsoncxx/v_noabi/bsoncxx/config/private/config.hh
61+
bsoncxx/private/config/config.hh.in
62+
bsoncxx/private/config/config.hh
5963
)
6064
endif()
6165

@@ -81,19 +85,20 @@ endif()
8185

8286
set_dist_list(src_bsoncxx_lib_DIST
8387
CMakeLists.txt
88+
${bsoncxx_sources_private}
8489
${bsoncxx_sources_v_noabi}
8590
${bsoncxx_sources_v1}
86-
bsoncxx/v_noabi/bsoncxx/config/private/config.hh.in
87-
bsoncxx/v_noabi/bsoncxx/config/private/postlude.hh
88-
bsoncxx/v_noabi/bsoncxx/config/private/prelude.hh
89-
bsoncxx/v_noabi/bsoncxx/private/b64_ntop.hh
90-
bsoncxx/v_noabi/bsoncxx/private/helpers.hh
91-
bsoncxx/v_noabi/bsoncxx/private/make_unique.hh
92-
bsoncxx/v_noabi/bsoncxx/private/itoa.hh
93-
bsoncxx/v_noabi/bsoncxx/private/libbson.hh
94-
bsoncxx/v_noabi/bsoncxx/private/stack.hh
95-
bsoncxx/v_noabi/bsoncxx/private/suppress_deprecation_warnings.hh
96-
bsoncxx/v_noabi/bsoncxx/test_util/export_for_testing.hh
91+
bsoncxx/private/b64_ntop.hh
92+
bsoncxx/private/config/config.hh.in
93+
bsoncxx/private/config/postlude.hh
94+
bsoncxx/private/config/prelude.hh
95+
bsoncxx/private/helpers.hh
96+
bsoncxx/private/itoa.hh
97+
bsoncxx/private/libbson.hh
98+
bsoncxx/private/make_unique.hh
99+
bsoncxx/private/stack.hh
100+
bsoncxx/private/suppress_deprecation_warnings.hh
101+
bsoncxx/test_util/export_for_testing.hh
97102
bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh
98103
bsoncxx/v_noabi/bsoncxx/types/private/convert.hh
99104
bsoncxx/v1/config/config.hpp.in

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/b64_ntop.hh renamed to ‎src/bsoncxx/lib/bsoncxx/private/b64_ntop.hh

File renamed without changes.

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/config.hh.in renamed to ‎src/bsoncxx/lib/bsoncxx/private/config/config.hh.in

File renamed without changes.

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/postlude.hh renamed to ‎src/bsoncxx/lib/bsoncxx/private/config/postlude.hh

File renamed without changes.

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/prelude.hh renamed to ‎src/bsoncxx/lib/bsoncxx/private/config/prelude.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
// NOTE: Push any macros here that are defined by the following
1818
// headers here.
1919

20-
#include <bsoncxx/config/private/config.hh>
20+
#include <bsoncxx/private/config/config.hh>

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/helpers.hh renamed to ‎src/bsoncxx/lib/bsoncxx/private/helpers.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <bsoncxx/oid.hpp>
2020
#include <bsoncxx/private/libbson.hh>
2121

22-
#include <bsoncxx/config/private/prelude.hh>
22+
#include <bsoncxx/private/config/prelude.hh>
2323

2424
namespace bsoncxx {
2525
namespace helpers {
@@ -48,4 +48,4 @@ inline bsoncxx::v_noabi::oid make_oid(bson_oid_t const* bson_oid) {
4848
} // namespace helpers
4949
} // namespace bsoncxx
5050

51-
#include <bsoncxx/config/private/postlude.hh>
51+
#include <bsoncxx/private/config/postlude.hh>

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.cpp renamed to ‎src/bsoncxx/lib/bsoncxx/private/itoa.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include <bsoncxx/private/itoa.hh>
1616

17-
#include <bsoncxx/config/private/prelude.hh>
17+
#include <bsoncxx/private/config/prelude.hh>
1818

1919
namespace bsoncxx {
2020

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.hh renamed to ‎src/bsoncxx/lib/bsoncxx/private/itoa.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include <bsoncxx/test_util/export_for_testing.hh>
2121

22-
#include <bsoncxx/config/private/prelude.hh>
22+
#include <bsoncxx/private/config/prelude.hh>
2323

2424
namespace bsoncxx {
2525

@@ -60,4 +60,4 @@ class itoa {
6060

6161
} // namespace bsoncxx
6262

63-
#include <bsoncxx/config/private/postlude.hh>
63+
#include <bsoncxx/private/config/postlude.hh>

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/libbson.hh renamed to ‎src/bsoncxx/lib/bsoncxx/private/libbson.hh

File renamed without changes.

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/make_unique.hh renamed to ‎src/bsoncxx/lib/bsoncxx/private/make_unique.hh

File renamed without changes.

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/stack.hh renamed to ‎src/bsoncxx/lib/bsoncxx/private/stack.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <memory>
1919
#include <type_traits>
2020

21-
#include <bsoncxx/config/private/prelude.hh>
21+
#include <bsoncxx/private/config/prelude.hh>
2222

2323
namespace bsoncxx {
2424

@@ -162,4 +162,4 @@ class stack {
162162

163163
} // namespace bsoncxx
164164

165-
#include <bsoncxx/config/private/postlude.hh>
165+
#include <bsoncxx/private/config/postlude.hh>

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/suppress_deprecation_warnings.hh renamed to ‎src/bsoncxx/lib/bsoncxx/private/suppress_deprecation_warnings.hh

File renamed without changes.

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/test_util/export_for_testing.hh renamed to ‎src/bsoncxx/lib/bsoncxx/test_util/export_for_testing.hh

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

1515
#pragma once
1616

17-
#include <bsoncxx/config/private/prelude.hh>
17+
#include <bsoncxx/private/config/prelude.hh>
1818

1919
// The BSONCXX_TESTING macro is intended to be used for exporting symbols for testing which are not
2020
// normally exported as part of the bsoncxx library. We currently use this workaround in lieu of
@@ -29,4 +29,4 @@
2929
#define BSONCXX_ABI_EXPORT_CDECL_TESTING(...) __VA_ARGS__
3030
#endif
3131

32-
#include <bsoncxx/config/private/postlude.hh>
32+
#include <bsoncxx/private/config/postlude.hh>

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <bsoncxx/array/element.hpp>
1818
#include <bsoncxx/types/bson_value/view.hpp>
1919

20-
#include <bsoncxx/config/private/prelude.hh>
20+
#include <bsoncxx/private/config/prelude.hh>
2121

2222
namespace bsoncxx {
2323
namespace v_noabi {

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <bsoncxx/array/value.hpp>
1818

19-
#include <bsoncxx/config/private/prelude.hh>
19+
#include <bsoncxx/private/config/prelude.hh>
2020

2121
namespace bsoncxx {
2222
namespace v_noabi {

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <bsoncxx/types.hpp>
2222
#include <bsoncxx/types/bson_value/view.hpp>
2323

24-
#include <bsoncxx/config/private/prelude.hh>
24+
#include <bsoncxx/private/config/prelude.hh>
2525

2626
namespace bsoncxx {
2727
namespace v_noabi {

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <bsoncxx/types.hpp>
2828
#include <bsoncxx/types/bson_value/view.hpp>
2929

30-
#include <bsoncxx/config/private/prelude.hh>
30+
#include <bsoncxx/private/config/prelude.hh>
3131

3232
namespace bsoncxx {
3333
namespace v_noabi {

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <bsoncxx/stdx/string_view.hpp>
2020
#include <bsoncxx/string/to_string.hpp>
2121

22-
#include <bsoncxx/config/private/prelude.hh>
22+
#include <bsoncxx/private/config/prelude.hh>
2323

2424
namespace bsoncxx {
2525
namespace v_noabi {

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <bsoncxx/types/bson_value/value.hpp>
2525
#include <bsoncxx/types/bson_value/view.hpp>
2626

27-
#include <bsoncxx/config/private/prelude.hh>
27+
#include <bsoncxx/private/config/prelude.hh>
2828

2929
#define BSONCXX_CITER \
3030
bson_iter_t iter; \

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <bsoncxx/document/value.hpp>
1818

19-
#include <bsoncxx/config/private/prelude.hh>
19+
#include <bsoncxx/private/config/prelude.hh>
2020

2121
namespace bsoncxx {
2222
namespace v_noabi {

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <bsoncxx/private/libbson.hh>
2020
#include <bsoncxx/types.hpp>
2121

22-
#include <bsoncxx/config/private/prelude.hh>
22+
#include <bsoncxx/private/config/prelude.hh>
2323

2424
namespace bsoncxx {
2525
namespace v_noabi {

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <bsoncxx/exception/error_code.hpp>
1818

19-
#include <bsoncxx/config/private/prelude.hh>
19+
#include <bsoncxx/private/config/prelude.hh>
2020

2121
namespace bsoncxx {
2222
namespace v_noabi {

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <bsoncxx/types.hpp>
2626
#include <bsoncxx/types/bson_value/view.hpp>
2727

28-
#include <bsoncxx/config/private/prelude.hh>
28+
#include <bsoncxx/private/config/prelude.hh>
2929

3030
namespace bsoncxx {
3131
namespace v_noabi {

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <bsoncxx/oid.hpp>
2020
#include <bsoncxx/private/libbson.hh>
2121

22-
#include <bsoncxx/config/private/prelude.hh>
22+
#include <bsoncxx/private/config/prelude.hh>
2323

2424
namespace bsoncxx {
2525
namespace v_noabi {

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <bsoncxx/string/to_string.hpp>
1616
#include <bsoncxx/string/view_or_value.hpp>
1717

18-
#include <bsoncxx/config/private/prelude.hh>
18+
#include <bsoncxx/private/config/prelude.hh>
1919

2020
namespace bsoncxx {
2121
namespace v_noabi {

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include <bsoncxx/types.hpp>
1616

17-
#include <bsoncxx/config/private/prelude.hh>
17+
#include <bsoncxx/private/config/prelude.hh>
1818

1919
namespace bsoncxx {
2020
namespace v_noabi {

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <bsoncxx/types/bson_value/value.hpp>
1919
#include <bsoncxx/types/bson_value/view.hpp>
2020

21-
#include <bsoncxx/config/private/prelude.hh>
21+
#include <bsoncxx/private/config/prelude.hh>
2222

2323
namespace bsoncxx {
2424
namespace v_noabi {
@@ -65,4 +65,4 @@ inline bson_value::value make_owning_bson(void* internal_value) {
6565
} // namespace v_noabi
6666
} // namespace bsoncxx
6767

68-
#include <bsoncxx/config/private/postlude.hh>
68+
#include <bsoncxx/private/config/postlude.hh>

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <bsoncxx/types/bson_value/value.hpp>
2020
#include <bsoncxx/types/private/convert.hh>
2121

22-
#include <bsoncxx/config/private/prelude.hh>
22+
#include <bsoncxx/private/config/prelude.hh>
2323

2424
namespace bsoncxx {
2525
namespace v_noabi {

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <bsoncxx/types/bson_value/view.hpp>
2222
#include <bsoncxx/types/private/convert.hh>
2323

24-
#include <bsoncxx/config/private/prelude.hh>
24+
#include <bsoncxx/private/config/prelude.hh>
2525

2626
#define BSONCXX_CITER \
2727
bson_iter_t iter; \

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <bsoncxx/types.hpp>
2222
#include <bsoncxx/types/bson_value/view.hpp>
2323

24-
#include <bsoncxx/config/private/prelude.hh>
24+
#include <bsoncxx/private/config/prelude.hh>
2525

2626
namespace bsoncxx {
2727
namespace v_noabi {
@@ -327,4 +327,4 @@ inline void convert_from_libbson(bson_value_t const* v, b_array* out) {
327327
} // namespace v_noabi
328328
} // namespace bsoncxx
329329

330-
#include <bsoncxx/config/private/postlude.hh>
330+
#include <bsoncxx/private/config/postlude.hh>

‎src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <bsoncxx/private/make_unique.hh>
1717
#include <bsoncxx/validate.hpp>
1818

19-
#include <bsoncxx/config/private/prelude.hh>
19+
#include <bsoncxx/private/config/prelude.hh>
2020

2121
namespace bsoncxx {
2222
namespace v_noabi {

‎src/bsoncxx/test/catch.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <bsoncxx/stdx/operators.hpp>
2121
#include <bsoncxx/stdx/optional.hpp>
2222

23-
#include <bsoncxx/config/private/prelude.hh>
23+
#include <bsoncxx/private/config/prelude.hh>
2424

2525
#include <bsoncxx/test/to_string.hh>
2626

@@ -149,4 +149,4 @@ struct StringMaker<bsoncxx::detail::strong_ordering> {
149149

150150
} // namespace Catch
151151

152-
#include <bsoncxx/config/private/postlude.hh>
152+
#include <bsoncxx/private/config/postlude.hh>

‎src/bsoncxx/test/exception_guard.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <bsoncxx/stdx/string_view.hpp>
2525

26-
#include <bsoncxx/config/private/prelude.hh>
26+
#include <bsoncxx/private/config/prelude.hh>
2727

2828
#include <bsoncxx/test/catch.hh>
2929

@@ -102,4 +102,4 @@ struct exception_guard_state {
102102
} // namespace test
103103
} // namespace bsoncxx
104104

105-
#include <bsoncxx/config/private/postlude.hh>
105+
#include <bsoncxx/private/config/postlude.hh>

‎src/bsoncxx/test/to_string.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <bsoncxx/string/to_string.hpp>
2727
#include <bsoncxx/types/bson_value/view_or_value.hpp>
2828

29-
#include <bsoncxx/config/private/prelude.hh>
29+
#include <bsoncxx/private/config/prelude.hh>
3030

3131
namespace bsoncxx {
3232

@@ -93,4 +93,4 @@ inline std::string to_string(bsoncxx::v_noabi::types::bson_value::view_or_value
9393

9494
} // namespace bsoncxx
9595

96-
#include <bsoncxx/config/private/postlude.hh>
96+
#include <bsoncxx/private/config/postlude.hh>

0 commit comments

Comments
 (0)