Export of internal Abseil changes
-- ea0cfebeb69b25bec343652bbe1a203f5476c51a by Mark Barolak <mbar@google.com>: Change "std::string" to "string" in places where a "std::" qualification was incorrectly inserted by automation. PiperOrigin-RevId: 300108520 GitOrigin-RevId: ea0cfebeb69b25bec343652bbe1a203f5476c51a Change-Id: Ie3621e63a6ebad67b9fe56a3ebe33e1d50dac602
This commit is contained in:
Abseil Team
Derek Mauro
parent
d936052d32
commit
a877af1f29
68 changed files with 191 additions and 191 deletions
|
|
@ -99,7 +99,7 @@ namespace substitute_internal {
|
|||
// This class has implicit constructors.
|
||||
class Arg {
|
||||
public:
|
||||
// Overloads for std::string-y things
|
||||
// Overloads for string-y things
|
||||
//
|
||||
// Explicitly overload `const char*` so the compiler doesn't cast to `bool`.
|
||||
Arg(const char* value) // NOLINT(runtime/explicit)
|
||||
|
|
@ -360,13 +360,13 @@ inline void SubstituteAndAppend(
|
|||
void SubstituteAndAppend(std::string* output, const char* format)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 0,
|
||||
"There were no substitution arguments "
|
||||
"but this format std::string has a $[0-9] in it");
|
||||
"but this format string has a $[0-9] in it");
|
||||
|
||||
void SubstituteAndAppend(std::string* output, const char* format,
|
||||
const substitute_internal::Arg& a0)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 1,
|
||||
"There was 1 substitution argument given, but "
|
||||
"this format std::string is either missing its $0, or "
|
||||
"this format string is either missing its $0, or "
|
||||
"contains one of $1-$9");
|
||||
|
||||
void SubstituteAndAppend(std::string* output, const char* format,
|
||||
|
|
@ -374,7 +374,7 @@ void SubstituteAndAppend(std::string* output, const char* format,
|
|||
const substitute_internal::Arg& a1)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 3,
|
||||
"There were 2 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0/$1, or "
|
||||
"this format string is either missing its $0/$1, or "
|
||||
"contains one of $2-$9");
|
||||
|
||||
void SubstituteAndAppend(std::string* output, const char* format,
|
||||
|
|
@ -383,7 +383,7 @@ void SubstituteAndAppend(std::string* output, const char* format,
|
|||
const substitute_internal::Arg& a2)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 7,
|
||||
"There were 3 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0/$1/$2, or "
|
||||
"this format string is either missing its $0/$1/$2, or "
|
||||
"contains one of $3-$9");
|
||||
|
||||
void SubstituteAndAppend(std::string* output, const char* format,
|
||||
|
|
@ -393,7 +393,7 @@ void SubstituteAndAppend(std::string* output, const char* format,
|
|||
const substitute_internal::Arg& a3)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 15,
|
||||
"There were 4 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0-$3, or "
|
||||
"this format string is either missing its $0-$3, or "
|
||||
"contains one of $4-$9");
|
||||
|
||||
void SubstituteAndAppend(std::string* output, const char* format,
|
||||
|
|
@ -404,7 +404,7 @@ void SubstituteAndAppend(std::string* output, const char* format,
|
|||
const substitute_internal::Arg& a4)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 31,
|
||||
"There were 5 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0-$4, or "
|
||||
"this format string is either missing its $0-$4, or "
|
||||
"contains one of $5-$9");
|
||||
|
||||
void SubstituteAndAppend(std::string* output, const char* format,
|
||||
|
|
@ -416,7 +416,7 @@ void SubstituteAndAppend(std::string* output, const char* format,
|
|||
const substitute_internal::Arg& a5)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 63,
|
||||
"There were 6 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0-$5, or "
|
||||
"this format string is either missing its $0-$5, or "
|
||||
"contains one of $6-$9");
|
||||
|
||||
void SubstituteAndAppend(
|
||||
|
|
@ -426,7 +426,7 @@ void SubstituteAndAppend(
|
|||
const substitute_internal::Arg& a5, const substitute_internal::Arg& a6)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 127,
|
||||
"There were 7 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0-$6, or "
|
||||
"this format string is either missing its $0-$6, or "
|
||||
"contains one of $7-$9");
|
||||
|
||||
void SubstituteAndAppend(
|
||||
|
|
@ -437,7 +437,7 @@ void SubstituteAndAppend(
|
|||
const substitute_internal::Arg& a7)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 255,
|
||||
"There were 8 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0-$7, or "
|
||||
"this format string is either missing its $0-$7, or "
|
||||
"contains one of $8-$9");
|
||||
|
||||
void SubstituteAndAppend(
|
||||
|
|
@ -449,7 +449,7 @@ void SubstituteAndAppend(
|
|||
ABSL_BAD_CALL_IF(
|
||||
substitute_internal::PlaceholderBitmask(format) != 511,
|
||||
"There were 9 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0-$8, or contains a $9");
|
||||
"this format string is either missing its $0-$8, or contains a $9");
|
||||
|
||||
void SubstituteAndAppend(
|
||||
std::string* output, const char* format, const substitute_internal::Arg& a0,
|
||||
|
|
@ -460,7 +460,7 @@ void SubstituteAndAppend(
|
|||
const substitute_internal::Arg& a9)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 1023,
|
||||
"There were 10 substitution arguments given, but this "
|
||||
"format std::string doesn't contain all of $0 through $9");
|
||||
"format string doesn't contain all of $0 through $9");
|
||||
#endif // ABSL_BAD_CALL_IF
|
||||
|
||||
// Substitute()
|
||||
|
|
@ -586,19 +586,19 @@ ABSL_MUST_USE_RESULT inline std::string Substitute(
|
|||
std::string Substitute(const char* format)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 0,
|
||||
"There were no substitution arguments "
|
||||
"but this format std::string has a $[0-9] in it");
|
||||
"but this format string has a $[0-9] in it");
|
||||
|
||||
std::string Substitute(const char* format, const substitute_internal::Arg& a0)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 1,
|
||||
"There was 1 substitution argument given, but "
|
||||
"this format std::string is either missing its $0, or "
|
||||
"this format string is either missing its $0, or "
|
||||
"contains one of $1-$9");
|
||||
|
||||
std::string Substitute(const char* format, const substitute_internal::Arg& a0,
|
||||
const substitute_internal::Arg& a1)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 3,
|
||||
"There were 2 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0/$1, or "
|
||||
"this format string is either missing its $0/$1, or "
|
||||
"contains one of $2-$9");
|
||||
|
||||
std::string Substitute(const char* format, const substitute_internal::Arg& a0,
|
||||
|
|
@ -606,7 +606,7 @@ std::string Substitute(const char* format, const substitute_internal::Arg& a0,
|
|||
const substitute_internal::Arg& a2)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 7,
|
||||
"There were 3 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0/$1/$2, or "
|
||||
"this format string is either missing its $0/$1/$2, or "
|
||||
"contains one of $3-$9");
|
||||
|
||||
std::string Substitute(const char* format, const substitute_internal::Arg& a0,
|
||||
|
|
@ -615,7 +615,7 @@ std::string Substitute(const char* format, const substitute_internal::Arg& a0,
|
|||
const substitute_internal::Arg& a3)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 15,
|
||||
"There were 4 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0-$3, or "
|
||||
"this format string is either missing its $0-$3, or "
|
||||
"contains one of $4-$9");
|
||||
|
||||
std::string Substitute(const char* format, const substitute_internal::Arg& a0,
|
||||
|
|
@ -625,7 +625,7 @@ std::string Substitute(const char* format, const substitute_internal::Arg& a0,
|
|||
const substitute_internal::Arg& a4)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 31,
|
||||
"There were 5 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0-$4, or "
|
||||
"this format string is either missing its $0-$4, or "
|
||||
"contains one of $5-$9");
|
||||
|
||||
std::string Substitute(const char* format, const substitute_internal::Arg& a0,
|
||||
|
|
@ -636,7 +636,7 @@ std::string Substitute(const char* format, const substitute_internal::Arg& a0,
|
|||
const substitute_internal::Arg& a5)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 63,
|
||||
"There were 6 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0-$5, or "
|
||||
"this format string is either missing its $0-$5, or "
|
||||
"contains one of $6-$9");
|
||||
|
||||
std::string Substitute(const char* format, const substitute_internal::Arg& a0,
|
||||
|
|
@ -648,7 +648,7 @@ std::string Substitute(const char* format, const substitute_internal::Arg& a0,
|
|||
const substitute_internal::Arg& a6)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 127,
|
||||
"There were 7 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0-$6, or "
|
||||
"this format string is either missing its $0-$6, or "
|
||||
"contains one of $7-$9");
|
||||
|
||||
std::string Substitute(const char* format, const substitute_internal::Arg& a0,
|
||||
|
|
@ -661,7 +661,7 @@ std::string Substitute(const char* format, const substitute_internal::Arg& a0,
|
|||
const substitute_internal::Arg& a7)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 255,
|
||||
"There were 8 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0-$7, or "
|
||||
"this format string is either missing its $0-$7, or "
|
||||
"contains one of $8-$9");
|
||||
|
||||
std::string Substitute(
|
||||
|
|
@ -673,7 +673,7 @@ std::string Substitute(
|
|||
ABSL_BAD_CALL_IF(
|
||||
substitute_internal::PlaceholderBitmask(format) != 511,
|
||||
"There were 9 substitution arguments given, but "
|
||||
"this format std::string is either missing its $0-$8, or contains a $9");
|
||||
"this format string is either missing its $0-$8, or contains a $9");
|
||||
|
||||
std::string Substitute(
|
||||
const char* format, const substitute_internal::Arg& a0,
|
||||
|
|
@ -684,7 +684,7 @@ std::string Substitute(
|
|||
const substitute_internal::Arg& a9)
|
||||
ABSL_BAD_CALL_IF(substitute_internal::PlaceholderBitmask(format) != 1023,
|
||||
"There were 10 substitution arguments given, but this "
|
||||
"format std::string doesn't contain all of $0 through $9");
|
||||
"format string doesn't contain all of $0 through $9");
|
||||
#endif // ABSL_BAD_CALL_IF
|
||||
|
||||
ABSL_NAMESPACE_END
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue