From 9c4178d13e84acf3f0d1b8aeee1f67862aeeadc9 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Mon, 2 Oct 2017 09:45:23 -0700 Subject: Changes imported from Abseil "staging" branch: - 1a906f90b303c6fbac292f4883186a27e7c6476c Increase the mutex_test timeout (by removing the timeout ... by Derek Mauro - cfc1d3e56727e5b3a41b7d9dfc513f692ac0edd6 Require iOS 9.0 for ABSL_HAVE_THREAD_LOCAL. by Matt Armstrong - 22dc24504ac6fbd2a22f5d45a4bd00fe14d500c3 Fix indentation by Jorg Brown GitOrigin-RevId: 1a906f90b303c6fbac292f4883186a27e7c6476c Change-Id: Id6075001460bd6b9ce973897544269fa4103fee8 --- absl/strings/string_view.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'absl/strings/string_view.h') diff --git a/absl/strings/string_view.h b/absl/strings/string_view.h index 5dd08b3a5627..033509ada239 100644 --- a/absl/strings/string_view.h +++ b/absl/strings/string_view.h @@ -482,21 +482,21 @@ class string_view { static constexpr size_type kMaxSize = std::numeric_limits::max() / 2 + 1; - static constexpr size_type StrLenInternal(const char* str) { - return str ? -// check whether __builtin_strlen is provided by the compiler. -// GCC doesn't have __has_builtin() -// (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66970), -// but has __builtin_strlen according to -// https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Other-Builtins.html. + // check whether __builtin_strlen is provided by the compiler. + // GCC doesn't have __has_builtin() + // (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66970), + // but has __builtin_strlen according to + // https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Other-Builtins.html. #if ABSL_HAVE_BUILTIN(__builtin_strlen) || \ (defined(__GNUC__) && !defined(__clang__)) - __builtin_strlen(str) + static constexpr size_type StrLenInternal(const char* str) { + return str ? __builtin_strlen(str) : 0; + } #else - strlen(str) -#endif - : 0; + static constexpr size_type StrLenInternal(const char* str) { + return str ? strlen(str) : 0; } +#endif static constexpr size_type CheckLengthInternal(size_type len) { return ABSL_ASSERT(len <= kMaxSize), len; -- cgit 1.4.1