Skip to content

Commit 1954c88

Browse files
committed
minor: don't use braced init of stdx::string_view
GCC 7 issues an annoying diagnostic when building with -Wconversion that we would prefer not to raise. Since initialization with () works just as weil, use that.
1 parent 8a5202e commit 1954c88

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

src/bsoncxx/test/bson_builder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ TEST_CASE("document core builder ownership", "[bsoncxx::builder::core]") {
677677

678678
SECTION("when passing a stdx::string_view, ownership handled by caller") {
679679
std::string key{"sabich"};
680-
stdx::string_view key_view{key};
680+
stdx::string_view key_view(key);
681681
b.key_view(key_view);
682682
b.append(1);
683683
}

src/bsoncxx/test/view_or_value.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ TEST_CASE("string::document::view_or_value", "[bsoncxx::string::view_or_value]")
187187

188188
SECTION("can be constructed with a stdx::string_view") {
189189
std::string name{"Mike"};
190-
stdx::string_view name_view{name};
190+
stdx::string_view name_view(name);
191191
string::view_or_value mike{name_view};
192192

193193
SECTION("is non-owning") {

src/mongocxx/test/client.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ TEST_CASE("integration tests for client metadata handshake feature") {
251251
auto op_view = it.get_document().view();
252252

253253
if (!op_view["appName"] ||
254-
op_view["appName"].get_utf8().value != stdx::string_view{app_name}) {
254+
op_view["appName"].get_utf8().value != stdx::string_view(app_name)) {
255255
continue;
256256
}
257257

@@ -267,7 +267,7 @@ TEST_CASE("integration tests for client metadata handshake feature") {
267267

268268
REQUIRE(metadata_view["application"]);
269269
auto application = metadata_view["application"].get_document();
270-
REQUIRE(application.view()["name"].get_utf8().value == stdx::string_view{app_name});
270+
REQUIRE(application.view()["name"].get_utf8().value == stdx::string_view(app_name));
271271

272272
REQUIRE(metadata_view["driver"]);
273273
auto driver = metadata_view["driver"].get_document();

src/mongocxx/test/collection.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,17 +128,17 @@ TEST_CASE("collection renaming", "[collection]") {
128128
coll.insert_one(filter.view()); // Ensure that the collection exists.
129129
other_coll.insert_one({});
130130

131-
REQUIRE(coll.name() == stdx::string_view{collname});
131+
REQUIRE(coll.name() == stdx::string_view(collname));
132132

133133
std::string new_name{"mongo_cxx_newname"};
134134
coll.rename(new_name, false);
135135

136-
REQUIRE(coll.name() == stdx::string_view{new_name});
136+
REQUIRE(coll.name() == stdx::string_view(new_name));
137137

138138
REQUIRE(coll.find_one(filter.view(), {}));
139139

140140
coll.rename(other_collname, true);
141-
REQUIRE(coll.name() == stdx::string_view{other_collname});
141+
REQUIRE(coll.name() == stdx::string_view(other_collname));
142142
REQUIRE(coll.find_one(filter.view(), {}));
143143

144144
coll.drop();
@@ -2266,7 +2266,7 @@ TEST_CASE("create_index tests", "[collection]") {
22662266
options.name(indexName);
22672267

22682268
auto response = coll.create_index(index.view(), options);
2269-
REQUIRE(response.view()["name"].get_utf8().value == bsoncxx::stdx::string_view{indexName});
2269+
REQUIRE(response.view()["name"].get_utf8().value == bsoncxx::stdx::string_view(indexName));
22702270

22712271
find_index_and_validate(coll, indexName);
22722272

@@ -2423,7 +2423,7 @@ TEST_CASE("list_indexes", "[collection]") {
24232423
auto name = index["name"].get_utf8();
24242424

24252425
for (auto&& expected : expected_names) {
2426-
if (bsoncxx::stdx::string_view{expected} == name.value) {
2426+
if (bsoncxx::stdx::string_view(expected) == name.value) {
24272427
found++;
24282428
if (expected == "a_1") {
24292429
REQUIRE(index["unique"]);

src/mongocxx/test/gridfs/bucket.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void validate_gridfs_file(database db,
6363
expected_contents.size());
6464
REQUIRE(files_doc->view()["chunkSize"].get_int32().value == expected_chunk_size);
6565
REQUIRE(files_doc->view()["filename"].get_utf8().value ==
66-
stdx::string_view{expected_file_name});
66+
stdx::string_view(expected_file_name));
6767

6868
std::int32_t index = 0;
6969

@@ -118,7 +118,7 @@ void validate_gridfs_file(
118118
REQUIRE(static_cast<std::size_t>(files_doc->view()["chunkSize"].get_int32().value) ==
119119
expected_chunk_size);
120120
REQUIRE(files_doc->view()["filename"].get_utf8().value ==
121-
stdx::string_view{expected_file_name});
121+
stdx::string_view(expected_file_name));
122122

123123
std::size_t i = 0;
124124

src/mongocxx/test/index_view.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ TEST_CASE("create_many", "[index_view]") {
210210
auto name = index["name"].get_utf8();
211211

212212
for (auto expected : expected_names) {
213-
if (stdx::string_view{expected} == name.value) {
213+
if (stdx::string_view(expected) == name.value) {
214214
found++;
215215
}
216216
}

src/mongocxx/test/result/gridfs/upload.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ TEST_CASE("result::gridfs::upload owns id", "[result::gridfs::upload]") {
5757

5858
// Because result::gridfs::upload owns its id, we should still be able to correctly read new
5959
// value for the id.
60-
REQUIRE(res.id().get_utf8().value == stdx::string_view{bar});
60+
REQUIRE(res.id().get_utf8().value == stdx::string_view(bar));
6161
}
6262

6363
TEST_CASE("result::gridfs::upload equals", "[result::gridfs::upload]") {

0 commit comments

Comments
 (0)