Skip to content

Commit dca653d

Browse files
Remove extra string constructors that aren't necessary anymore.
1 parent 04594d5 commit dca653d

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

cpp/src/Slice/Parser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ Slice::DefinitionContext::getMetadataArgs(string_view directive) const
240240
{
241241
if (p->directive() == directive)
242242
{
243-
return string{p->arguments()};
243+
return p->arguments();
244244
}
245245
}
246246
return nullopt;
@@ -974,7 +974,7 @@ Slice::Contained::getMetadataArgs(string_view directive) const
974974
{
975975
if (p->directive() == directive)
976976
{
977-
return string{p->arguments()};
977+
return p->arguments();
978978
}
979979
}
980980
return nullopt;

cpp/src/slice2cpp/CPlusPlusUtil.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -956,13 +956,13 @@ Slice::findMetadata(const MetadataList& metadata, TypeContext typeCtx)
956956
{
957957
if (directive == "cpp:view-type")
958958
{
959-
return string{meta->arguments()};
959+
return meta->arguments();
960960
}
961961
}
962962

963963
if (directive == "cpp:type")
964964
{
965-
return string{meta->arguments()};
965+
return meta->arguments();
966966
}
967967

968968
if ((typeCtx & (TypeContext::MarshalParam | TypeContext::UnmarshalParamZeroCopy)) != TypeContext::None)

cpp/src/slice2cs/Gen.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,7 +1680,7 @@ Slice::Gen::TypesVisitor::visitInterfaceDefStart(const InterfaceDefPtr& p)
16801680
{
16811681
if (metadata->directive() == "cs:implements")
16821682
{
1683-
baseNames.push_back(string{metadata->arguments()});
1683+
baseNames.push_back(metadata->arguments());
16841684
}
16851685
}
16861686

@@ -1952,7 +1952,7 @@ Slice::Gen::TypesVisitor::visitStructStart(const StructPtr& p)
19521952
{
19531953
if (metadata->directive() == "cs:implements")
19541954
{
1955-
baseNames.push_back(string{metadata->arguments()});
1955+
baseNames.push_back(metadata->arguments());
19561956
}
19571957
}
19581958

cpp/src/slice2java/Gen.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2318,7 +2318,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
23182318
{
23192319
if (metadata->directive() == "java:implements")
23202320
{
2321-
implements.push_back(string{metadata->arguments()});
2321+
implements.push_back(metadata->arguments());
23222322
}
23232323
}
23242324

@@ -2933,7 +2933,7 @@ Slice::Gen::TypesVisitor::visitStructStart(const StructPtr& p)
29332933
{
29342934
if (metadata->directive() == "java:implements")
29352935
{
2936-
implements.push_back(string{metadata->arguments()});
2936+
implements.push_back(metadata->arguments());
29372937
}
29382938
}
29392939

cpp/src/slice2java/JavaUtil.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2277,16 +2277,16 @@ Slice::JavaGenerator::getTypeMetadata(const MetadataList& metadata, string& inst
22772277
{
22782278
if (m->directive() == "java:type")
22792279
{
2280-
string_view arguments = m->arguments();
2280+
string arguments = m->arguments();
22812281
string::size_type pos = arguments.find(':');
22822282
if (pos != string::npos)
22832283
{
2284-
instanceType = string{arguments.substr(0, pos)};
2285-
formalType = string{arguments.substr(pos + 1)};
2284+
instanceType = arguments.substr(0, pos);
2285+
formalType = arguments.substr(pos + 1);
22862286
}
22872287
else
22882288
{
2289-
instanceType = string{arguments};
2289+
instanceType = arguments;
22902290
formalType.clear();
22912291
}
22922292
return true;

cpp/src/slice2swift/Gen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1462,7 +1462,7 @@ Gen::ObjectVisitor::visitInterfaceDefStart(const InterfaceDefPtr& p)
14621462
{
14631463
if (metadata->directive() == "swift:inherits")
14641464
{
1465-
baseNames.push_back(string{metadata->arguments()});
1465+
baseNames.push_back(metadata->arguments());
14661466
}
14671467
}
14681468

0 commit comments

Comments
 (0)