diff options
| author |  Abseil Team <absl-team@google.com> | 2017-12-21 19:39:42 -0800 |
|---|---|---|
| committer |  Xiaoyi Zhang <zhangxy988@gmail.com> | 2017-12-22 15:08:21 -0500 |
| commit | 17cde19a0f8c939524295d27c3774186ac9a1d29 (patch) | |
| tree | 5e10511803413133dc4b0a6b85663a624ea5e9e0 /absl/strings | |
| parent | ff7045647330f5dc21725a42456091207f3eecd5 (diff) | |
Changes imported from Abseil "staging" branch:
- f13b203bb87afd3a9330030fb97a1318083d8618 Fix SubstituteTest under C++17 with libc++. by Derek Mauro <dmauro@google.com>
- c551cdf6f70afac3f8ca143f4837f2187715eea9 Fix ABSL_HAVE_THREAD_LOCAL macro for Apple platforms. by Abseil Team <absl-team@google.com>
- 931020efc43c184c4124975f50a02b377d960f9d Add Abseil Compilers Guide by Tom Manshreck <shreck@google.com>
- 658f924ca7136c7994290955c5666b60da6ca5b9 Reimplement the SFINAE for allocator_traits::rebind to av... by Abseil Team <absl-team@google.com>
- 4cb04fa739f70dd5ad0c8421ff4c444645136c7f Fix minor spelling error of 'returning'. by Abseil Team <absl-team@google.com>
GitOrigin-RevId: f13b203bb87afd3a9330030fb97a1318083d8618
Change-Id: I8573087795a50f8cc8367b0af1aedfbd2a89a793
Diffstat (limited to 'absl/strings')
| -rw-r--r-- | absl/strings/escaping.h | 2 | ||||
| -rw-r--r-- | absl/strings/substitute.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/absl/strings/escaping.h b/absl/strings/escaping.h index 86f63aad..1af0afa7 100644 --- a/absl/strings/escaping.h +++ b/absl/strings/escaping.h @@ -152,7 +152,7 @@ std::string HexStringToBytes(absl::string_view from); // BytesToHexString() // -// Converts binary data into an ASCII text std::string, returing a std::string of size +// Converts binary data into an ASCII text std::string, returning a std::string of size // `2*from.size()`. std::string BytesToHexString(absl::string_view from); diff --git a/absl/strings/substitute.h b/absl/strings/substitute.h index 3fc4ac4c..76d6d8e9 100644 --- a/absl/strings/substitute.h +++ b/absl/strings/substitute.h @@ -109,7 +109,7 @@ class Arg { // // Explicitly overload `const char*` so the compiler doesn't cast to `bool`. Arg(const char* value) // NOLINT(runtime/explicit) - : piece_(value) {} + : piece_(absl::NullSafeStringView(value)) {} Arg(const std::string& value) // NOLINT(runtime/explicit) : piece_(value) {} Arg(absl::string_view value) // NOLINT(runtime/explicit) |