Skip to content

Commit 8a9ce93

Browse files
authored
CXX-2258 Change prelude order and rerun clang-format (#797)
Also use server_description_hello_response instead of legacy command
1 parent fa977f0 commit 8a9ce93

File tree

146 files changed

+283
-360
lines changed

Some content is hidden

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

146 files changed

+283
-360
lines changed

.clang-format

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1-
BasedOnStyle: Google
21
AllowShortFunctionsOnASingleLine: Empty
32
AllowShortIfStatementsOnASingleLine: false
43
AllowShortLoopsOnASingleLine: false
4+
BasedOnStyle: Google
55
BinPackArguments: false
66
BinPackParameters: false
77
ColumnLimit: 100
88
Cpp11BracedListStyle: true
99
DerivePointerAlignment: false
10+
IncludeBlocks: Regroup
11+
IncludeCategories:
12+
- Regex: 'prelude\.(hpp|hh)' # preludes
13+
Priority: 3
14+
- Regex: '<[[:alnum:]_.]+>' # system headers
15+
Priority: 1
16+
- Regex: '.*' # driver headers
17+
Priority: 2
1018
IndentWidth: 4
1119
MaxEmptyLinesToKeep: 1
1220
NamespaceIndentation: None

src/bsoncxx/array/element.cpp

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

15-
#include <bsoncxx/array/element.hpp>
16-
1715
#include <cstdlib>
1816
#include <cstring>
1917
#include <stdexcept>
2018

19+
#include <bsoncxx/array/element.hpp>
20+
2121
#include <bsoncxx/config/private/prelude.hh>
2222

2323
namespace bsoncxx {
@@ -32,6 +32,6 @@ element::element(const std::uint8_t* raw,
3232
std::uint32_t keylen)
3333
: document::element(raw, length, offset, keylen) {}
3434

35-
} // namespace document
35+
} // namespace array
3636
BSONCXX_INLINE_NAMESPACE_END
3737
} // namespace bsoncxx

src/bsoncxx/array/element.hpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,37 +41,37 @@ class BSONCXX_API element : private document::element {
4141

4242
using document::element::type;
4343

44-
using document::element::get_double;
45-
using document::element::get_utf8;
46-
using document::element::get_document;
4744
using document::element::get_array;
4845
using document::element::get_binary;
49-
using document::element::get_undefined;
50-
using document::element::get_oid;
5146
using document::element::get_bool;
52-
using document::element::get_date;
53-
using document::element::get_null;
54-
using document::element::get_regex;
55-
using document::element::get_dbpointer;
5647
using document::element::get_code;
57-
using document::element::get_symbol;
5848
using document::element::get_codewscope;
49+
using document::element::get_date;
50+
using document::element::get_dbpointer;
51+
using document::element::get_decimal128;
52+
using document::element::get_document;
53+
using document::element::get_double;
5954
using document::element::get_int32;
60-
using document::element::get_timestamp;
6155
using document::element::get_int64;
62-
using document::element::get_decimal128;
63-
using document::element::get_minkey;
6456
using document::element::get_maxkey;
57+
using document::element::get_minkey;
58+
using document::element::get_null;
59+
using document::element::get_oid;
60+
using document::element::get_regex;
61+
using document::element::get_symbol;
62+
using document::element::get_timestamp;
63+
using document::element::get_undefined;
64+
using document::element::get_utf8;
6565

6666
using document::element::get_value;
6767

6868
using document::element::operator[];
6969

70-
using document::element::raw;
70+
using document::element::key;
71+
using document::element::keylen;
7172
using document::element::length;
7273
using document::element::offset;
73-
using document::element::keylen;
74-
using document::element::key;
74+
using document::element::raw;
7575

7676
private:
7777
friend class view;

src/bsoncxx/array/value.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <bsoncxx/array/value.hpp>
16-
1715
#include <cstdlib>
1816
#include <cstring>
1917

18+
#include <bsoncxx/array/value.hpp>
19+
2020
#include <bsoncxx/config/private/prelude.hh>
2121

2222
namespace bsoncxx {

src/bsoncxx/array/view.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <bsoncxx/array/view.hpp>
16-
1715
#include <cstdlib>
1816
#include <cstring>
1917
#include <tuple>
2018

19+
#include <bsoncxx/array/view.hpp>
2120
#include <bsoncxx/private/itoa.hh>
2221
#include <bsoncxx/private/libbson.hh>
2322
#include <bsoncxx/types.hpp>

src/bsoncxx/builder/basic/array.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class array : public sub_array {
4242
///
4343
/// Move constructor
4444
///
45-
BSONCXX_INLINE array(array &&arr) noexcept : sub_array(&_core), _core(std::move(arr._core)) {}
45+
BSONCXX_INLINE array(array&& arr) noexcept : sub_array(&_core), _core(std::move(arr._core)) {}
4646

4747
///
4848
/// Move assignment operator

src/bsoncxx/builder/basic/document.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ class document : public sub_document {
4444
///
4545
/// Move constructor
4646
///
47-
BSONCXX_INLINE document(document &&doc) noexcept : sub_document(&_core),
48-
_core(std::move(doc._core)) {}
47+
BSONCXX_INLINE document(document&& doc) noexcept
48+
: sub_document(&_core), _core(std::move(doc._core)) {}
4949

5050
///
5151
/// Move assignment operator

src/bsoncxx/builder/core.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <bsoncxx/builder/core.hpp>
16-
1715
#include <cstring>
1816

17+
#include <bsoncxx/builder/core.hpp>
1918
#include <bsoncxx/exception/error_code.hpp>
2019
#include <bsoncxx/exception/exception.hpp>
2120
#include <bsoncxx/private/itoa.hh>

src/bsoncxx/decimal128.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// limitations under the License.
1414

1515
#include <bsoncxx/decimal128.hpp>
16-
1716
#include <bsoncxx/exception/error_code.hpp>
1817
#include <bsoncxx/exception/exception.hpp>
1918
#include <bsoncxx/private/libbson.hh>

src/bsoncxx/document/element.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <bsoncxx/document/element.hpp>
16-
1715
#include <cstdlib>
1816
#include <cstring>
1917

18+
#include <bsoncxx/document/element.hpp>
2019
#include <bsoncxx/exception/error_code.hpp>
2120
#include <bsoncxx/exception/exception.hpp>
2221
#include <bsoncxx/json.hpp>

0 commit comments

Comments
 (0)