Skip to content

Commit f60178d

Browse files
author
Michael Penick
committed
Fix build (on non-c++11 compilers)
1 parent 361d3a6 commit f60178d

1 file changed

Lines changed: 16 additions & 10 deletions

File tree

cpp-driver/gtests/src/unit/tests/test_cloud_secure_connect_config.cpp

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ class CloudSecureConnectionConfigTest : public Unit {
9999
zipClose(zip_file, NULL);
100100
}
101101

102-
static StringBuffer full_config_credsv1() {
103-
StringBuffer buffer;
102+
static void full_config_credsv1(StringBuffer& buffer) {
104103
Writer<StringBuffer> writer(buffer);
105104
writer.StartObject();
106105
writer.Key("username");
@@ -114,7 +113,6 @@ class CloudSecureConnectionConfigTest : public Unit {
114113
writer.Key("keyspace");
115114
writer.String("database_as_a_service");
116115
writer.EndObject();
117-
return buffer;
118116
}
119117

120118
private:
@@ -147,7 +145,8 @@ TEST_F(CloudSecureConnectionConfigTest, CredsV1) {
147145
Config config;
148146
CloudSecureConnectionConfig cloud_config;
149147

150-
StringBuffer buffer(full_config_credsv1());
148+
StringBuffer buffer;
149+
full_config_credsv1(buffer);
151150
create_zip_file(buffer.GetString());
152151

153152
EXPECT_TRUE(cloud_config.load(creds_zip_file(), &config));
@@ -271,23 +270,27 @@ TEST_F(CloudSecureConnectionConfigTest, InvalidCredsV1MissingConfigJson) {
271270
TEST_F(CloudSecureConnectionConfigTest, InvalidCredsV1MissingCA) {
272271
CloudSecureConnectionConfig config;
273272

274-
StringBuffer buffer(full_config_credsv1());
273+
StringBuffer buffer;
274+
full_config_credsv1(buffer);
275275
create_zip_file(buffer.GetString(), true, false);
276276
EXPECT_FALSE(config.load(creds_zip_file()));
277277
}
278278

279279
TEST_F(CloudSecureConnectionConfigTest, InvalidCredsV1MissingCert) {
280280
CloudSecureConnectionConfig config;
281281

282-
StringBuffer buffer(full_config_credsv1());
282+
StringBuffer buffer;
283+
full_config_credsv1(buffer);
283284
create_zip_file(buffer.GetString(), true, true, false);
284285
EXPECT_FALSE(config.load(creds_zip_file()));
285286
}
286287

287288
TEST_F(CloudSecureConnectionConfigTest, InvalidCredsV1MissingKey) {
288289
CloudSecureConnectionConfig config;
289290

290-
StringBuffer buffer(full_config_credsv1());
291+
StringBuffer buffer;
292+
full_config_credsv1(buffer);
293+
create_zip_file(buffer.GetString(), true, true, false);
291294
create_zip_file(buffer.GetString(), true, true, true, false);
292295
EXPECT_FALSE(config.load(creds_zip_file()));
293296
}
@@ -296,7 +299,8 @@ TEST_F(CloudSecureConnectionConfigTest, InvalidCredsV1SslCaCert) {
296299
Config config;
297300
CloudSecureConnectionConfig cloud_config;
298301

299-
StringBuffer buffer(full_config_credsv1());
302+
StringBuffer buffer;
303+
full_config_credsv1(buffer);
300304
set_invalid_ca_cert();
301305
create_zip_file(buffer.GetString());
302306

@@ -308,7 +312,8 @@ TEST_F(CloudSecureConnectionConfigTest, InvalidCredsV1SslCert) {
308312
Config config;
309313
CloudSecureConnectionConfig cloud_config;
310314

311-
StringBuffer buffer(full_config_credsv1());
315+
StringBuffer buffer;
316+
full_config_credsv1(buffer);
312317
set_invalid_cert();
313318
create_zip_file(buffer.GetString());
314319

@@ -320,7 +325,8 @@ TEST_F(CloudSecureConnectionConfigTest, InvalidCredsV1SslKey) {
320325
Config config;
321326
CloudSecureConnectionConfig cloud_config;
322327

323-
StringBuffer buffer(full_config_credsv1());
328+
StringBuffer buffer;
329+
full_config_credsv1(buffer);
324330
set_invalid_key();
325331
create_zip_file(buffer.GetString());
326332

0 commit comments

Comments
 (0)