Skip to content

Commit c132a4a

Browse files
reed-lauacozzette
reed-lau
authored and
acozzette
committed
replace 'const std::string&' with 'std::string'(by value)
1 parent e4c7ead commit c132a4a

File tree

3 files changed

+21
-110
lines changed

3 files changed

+21
-110
lines changed

‎src/google/protobuf/extension_set.h

+9-26
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,7 @@ class PROTOBUF_EXPORT ExtensionSet {
268268
void SetDouble(int number, FieldType type, double value, desc);
269269
void SetBool(int number, FieldType type, bool value, desc);
270270
void SetEnum(int number, FieldType type, int value, desc);
271-
void SetString(int number, FieldType type, const std::string& value, desc);
272-
void SetString(int number, FieldType type, std::string&& value, desc);
271+
void SetString(int number, FieldType type, std::string value, desc);
273272
std::string* MutableString(int number, FieldType type, desc);
274273
MessageLite* MutableMessage(int number, FieldType type,
275274
const MessageLite& prototype, desc);
@@ -332,8 +331,7 @@ class PROTOBUF_EXPORT ExtensionSet {
332331
void SetRepeatedDouble(int number, int index, double value);
333332
void SetRepeatedBool(int number, int index, bool value);
334333
void SetRepeatedEnum(int number, int index, int value);
335-
void SetRepeatedString(int number, int index, const std::string& value);
336-
void SetRepeatedString(int number, int index, std::string&& value);
334+
void SetRepeatedString(int number, int index, std::string value);
337335
std::string* MutableRepeatedString(int number, int index);
338336
MessageLite* MutableRepeatedMessage(int number, int index);
339337

@@ -346,8 +344,7 @@ class PROTOBUF_EXPORT ExtensionSet {
346344
void AddDouble(int number, FieldType type, bool packed, double value, desc);
347345
void AddBool(int number, FieldType type, bool packed, bool value, desc);
348346
void AddEnum(int number, FieldType type, bool packed, int value, desc);
349-
void AddString(int number, FieldType type, const std::string& value, desc);
350-
void AddString(int number, FieldType type, std::string&& value, desc);
347+
void AddString(int number, FieldType type, std::string value, desc);
351348
std::string* AddString(int number, FieldType type, desc);
352349
MessageLite* AddMessage(int number, FieldType type,
353350
const MessageLite& prototype, desc);
@@ -861,32 +858,18 @@ class PROTOBUF_EXPORT ExtensionSet {
861858

862859
// These are just for convenience...
863860
inline void ExtensionSet::SetString(int number, FieldType type,
864-
const std::string& value,
861+
std::string value,
865862
const FieldDescriptor* descriptor) {
866-
MutableString(number, type, descriptor)->assign(value);
867-
}
868-
inline void ExtensionSet::SetString(int number, FieldType type,
869-
std::string&& value,
870-
const FieldDescriptor* descriptor) {
871-
*MutableString(number, type, descriptor) = std::move(value);
872-
}
873-
inline void ExtensionSet::SetRepeatedString(int number, int index,
874-
const std::string& value) {
875-
MutableRepeatedString(number, index)->assign(value);
863+
MutableString(number, type, descriptor)->assign(std::move(value));
876864
}
877865
inline void ExtensionSet::SetRepeatedString(int number, int index,
878-
std::string&& value) {
879-
*MutableRepeatedString(number, index) = std::move(value);
880-
}
881-
inline void ExtensionSet::AddString(int number, FieldType type,
882-
const std::string& value,
883-
const FieldDescriptor* descriptor) {
884-
AddString(number, type, descriptor)->assign(value);
866+
std::string value) {
867+
MutableRepeatedString(number, index)->assign(std::move(value));
885868
}
886869
inline void ExtensionSet::AddString(int number, FieldType type,
887-
std::string&& value,
870+
std::string value,
888871
const FieldDescriptor* descriptor) {
889-
*AddString(number, type, descriptor) = std::move(value);
872+
AddString(number, type, descriptor)->assign(std::move(value));
890873
}
891874
// ===================================================================
892875
// Glue for generated extension accessors

‎src/google/protobuf/generated_message_reflection.cc

+9-75
Original file line numberDiff line numberDiff line change
@@ -1191,40 +1191,7 @@ const std::string& Reflection::GetStringReference(const Message& message,
11911191

11921192

11931193
void Reflection::SetString(Message* message, const FieldDescriptor* field,
1194-
const std::string& value) const {
1195-
USAGE_CHECK_ALL(SetString, SINGULAR, STRING);
1196-
if (field->is_extension()) {
1197-
return MutableExtensionSet(message)->SetString(field->number(),
1198-
field->type(), value, field);
1199-
} else {
1200-
switch (field->options().ctype()) {
1201-
default: // TODO(kenton): Support other string reps.
1202-
case FieldOptions::STRING: {
1203-
if (IsInlined(field)) {
1204-
MutableField<InlinedStringField>(message, field)
1205-
->SetNoArena(nullptr, value);
1206-
break;
1207-
}
1208-
1209-
const std::string* default_ptr =
1210-
&DefaultRaw<ArenaStringPtr>(field).Get();
1211-
if (field->containing_oneof() && !HasOneofField(*message, field)) {
1212-
ClearOneof(message, field->containing_oneof());
1213-
MutableField<ArenaStringPtr>(message, field)
1214-
->UnsafeSetDefault(default_ptr);
1215-
}
1216-
MutableField<ArenaStringPtr>(message, field)
1217-
->Mutable(default_ptr, GetArena(message))
1218-
->assign(value);
1219-
break;
1220-
}
1221-
}
1222-
}
1223-
}
1224-
1225-
1226-
void Reflection::SetString(Message* message, const FieldDescriptor* field,
1227-
std::string&& value) const {
1194+
std::string value) const {
12281195
USAGE_CHECK_ALL(SetString, SINGULAR, STRING);
12291196
if (field->is_extension()) {
12301197
return MutableExtensionSet(message)->SetString(field->number(),
@@ -1235,7 +1202,7 @@ void Reflection::SetString(Message* message, const FieldDescriptor* field,
12351202
case FieldOptions::STRING: {
12361203
if (IsInlined(field)) {
12371204
MutableField<InlinedStringField>(message, field)
1238-
->SetNoArena(nullptr, value);
1205+
->SetNoArena(nullptr, std::move(value));
12391206
break;
12401207
}
12411208

@@ -1246,8 +1213,8 @@ void Reflection::SetString(Message* message, const FieldDescriptor* field,
12461213
MutableField<ArenaStringPtr>(message, field)
12471214
->UnsafeSetDefault(default_ptr);
12481215
}
1249-
*(MutableField<ArenaStringPtr>(message, field)
1250-
->Mutable(default_ptr, GetArena(message))) = std::move(value);
1216+
MutableField<ArenaStringPtr>(message, field)
1217+
->Mutable(default_ptr, GetArena(message))->assign(std::move(value));
12511218
break;
12521219
}
12531220
}
@@ -1288,25 +1255,7 @@ const std::string& Reflection::GetRepeatedStringReference(
12881255

12891256
void Reflection::SetRepeatedString(Message* message,
12901257
const FieldDescriptor* field, int index,
1291-
const std::string& value) const {
1292-
USAGE_CHECK_ALL(SetRepeatedString, REPEATED, STRING);
1293-
if (field->is_extension()) {
1294-
MutableExtensionSet(message)->SetRepeatedString(field->number(), index,
1295-
value);
1296-
} else {
1297-
switch (field->options().ctype()) {
1298-
default: // TODO(kenton): Support other string reps.
1299-
case FieldOptions::STRING:
1300-
*MutableRepeatedField<std::string>(message, field, index) = value;
1301-
break;
1302-
}
1303-
}
1304-
}
1305-
1306-
1307-
void Reflection::SetRepeatedString(Message* message,
1308-
const FieldDescriptor* field, int index,
1309-
std::string&& value) const {
1258+
std::string value) const {
13101259
USAGE_CHECK_ALL(SetRepeatedString, REPEATED, STRING);
13111260
if (field->is_extension()) {
13121261
MutableExtensionSet(message)->SetRepeatedString(field->number(), index,
@@ -1315,31 +1264,15 @@ void Reflection::SetRepeatedString(Message* message,
13151264
switch (field->options().ctype()) {
13161265
default: // TODO(kenton): Support other string reps.
13171266
case FieldOptions::STRING:
1318-
*MutableRepeatedField<std::string>(message, field, index) = std::move(value);
1319-
break;
1320-
}
1321-
}
1322-
}
1323-
1324-
void Reflection::AddString(Message* message, const FieldDescriptor* field,
1325-
const std::string& value) const {
1326-
USAGE_CHECK_ALL(AddString, REPEATED, STRING);
1327-
if (field->is_extension()) {
1328-
MutableExtensionSet(message)->AddString(field->number(), field->type(),
1329-
value, field);
1330-
} else {
1331-
switch (field->options().ctype()) {
1332-
default: // TODO(kenton): Support other string reps.
1333-
case FieldOptions::STRING:
1334-
*AddField<std::string>(message, field) = value;
1267+
MutableRepeatedField<std::string>(message, field, index)->assign(std::move(value));
13351268
break;
13361269
}
13371270
}
13381271
}
13391272

13401273

13411274
void Reflection::AddString(Message* message, const FieldDescriptor* field,
1342-
std::string&& value) const {
1275+
std::string value) const {
13431276
USAGE_CHECK_ALL(AddString, REPEATED, STRING);
13441277
if (field->is_extension()) {
13451278
MutableExtensionSet(message)->AddString(field->number(), field->type(),
@@ -1348,12 +1281,13 @@ void Reflection::AddString(Message* message, const FieldDescriptor* field,
13481281
switch (field->options().ctype()) {
13491282
default: // TODO(kenton): Support other string reps.
13501283
case FieldOptions::STRING:
1351-
*AddField<std::string>(message, field) = std::move(value);
1284+
AddField<std::string>(message, field)->assign(std::move(value));
13521285
break;
13531286
}
13541287
}
13551288
}
13561289

1290+
13571291
// -------------------------------------------------------------------
13581292

13591293
const EnumValueDescriptor* Reflection::GetEnum(

‎src/google/protobuf/message.h

+3-9
Original file line numberDiff line numberDiff line change
@@ -539,9 +539,7 @@ class PROTOBUF_EXPORT Reflection final {
539539
void SetBool(Message* message, const FieldDescriptor* field,
540540
bool value) const;
541541
void SetString(Message* message, const FieldDescriptor* field,
542-
const std::string& value) const;
543-
void SetString(Message* message, const FieldDescriptor* field,
544-
std::string&& value) const;
542+
std::string value) const;
545543
void SetEnum(Message* message, const FieldDescriptor* field,
546544
const EnumValueDescriptor* value) const;
547545
// Set an enum field's value with an integer rather than EnumValueDescriptor.
@@ -641,9 +639,7 @@ class PROTOBUF_EXPORT Reflection final {
641639
void SetRepeatedBool(Message* message, const FieldDescriptor* field,
642640
int index, bool value) const;
643641
void SetRepeatedString(Message* message, const FieldDescriptor* field,
644-
int index, const std::string& value) const;
645-
void SetRepeatedString(Message* message, const FieldDescriptor* field,
646-
int index, std::string&& value) const;
642+
int index, std::string value) const;
647643
void SetRepeatedEnum(Message* message, const FieldDescriptor* field,
648644
int index, const EnumValueDescriptor* value) const;
649645
// Set an enum field's value with an integer rather than EnumValueDescriptor.
@@ -680,9 +676,7 @@ class PROTOBUF_EXPORT Reflection final {
680676
void AddBool(Message* message, const FieldDescriptor* field,
681677
bool value) const;
682678
void AddString(Message* message, const FieldDescriptor* field,
683-
const std::string& value) const;
684-
void AddString(Message* message, const FieldDescriptor* field,
685-
std::string&& value) const;
679+
std::string value) const;
686680
void AddEnum(Message* message, const FieldDescriptor* field,
687681
const EnumValueDescriptor* value) const;
688682
// Add an integer value to a repeated enum field rather than

0 commit comments

Comments
 (0)