mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes imported from Abseil "staging" branch:

Browse source 
- 1a906f90b303c6fbac292f4883186a27e7c6476c Increase the mutex_test timeout (by removing the timeout ... by Derek Mauro <dmauro@google.com>
  - cfc1d3e56727e5b3a41b7d9dfc513f692ac0edd6 Require iOS 9.0 for ABSL_HAVE_THREAD_LOCAL. by Matt Armstrong <marmstrong@google.com>
  - 22dc24504ac6fbd2a22f5d45a4bd00fe14d500c3 Fix indentation by Jorg Brown <jorg@google.com>

GitOrigin-RevId: 1a906f90b303c6fbac292f4883186a27e7c6476c
Change-Id: Id6075001460bd6b9ce973897544269fa4103fee8
This commit is contained in:
Abseil Team 2017-10-02 09:45:23 -07:00 committed by vslashg
parent 8d8dcb0ae5
commit 9c4178d13e
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
absl/base/config.h
View file

@ -162,9 +162,9 @@
#error ABSL_HAVE_THREAD_LOCAL cannot be directly set #error ABSL_HAVE_THREAD_LOCAL cannot be directly set
#elif !defined(__apple_build_version__) || \ #elif !defined(__apple_build_version__) || \
((__apple_build_version__ >= 8000042) && \ ((__apple_build_version__ >= 8000042) && \
!(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_8_0)) !(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0))
// Notes: Xcode's clang did not support `thread_local` until version // Notes: Xcode's clang did not support `thread_local` until version
// 8, and even then not for iOS < 8.0. // 8, and even then not for all iOS < 9.0.
#define ABSL_HAVE_THREAD_LOCAL 1 #define ABSL_HAVE_THREAD_LOCAL 1
#endif #endif

24
absl/strings/string_view.h
View file

@ -482,21 +482,21 @@ class string_view {
static constexpr size_type kMaxSize = static constexpr size_type kMaxSize =
std::numeric_limits<size_type>::max() / 2 + 1; std::numeric_limits<size_type>::max() / 2 + 1;
static constexpr size_type StrLenInternal(const char* str) { // check whether __builtin_strlen is provided by the compiler.
return str ? // GCC doesn't have __has_builtin()
// check whether __builtin_strlen is provided by the compiler. // (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66970),
// GCC doesn't have __has_builtin() // but has __builtin_strlen according to
// (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66970), // https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Other-Builtins.html.
// 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) || \ #if ABSL_HAVE_BUILTIN(__builtin_strlen) || \
(defined(__GNUC__) && !defined(__clang__)) (defined(__GNUC__) && !defined(__clang__))
__builtin_strlen(str) static constexpr size_type StrLenInternal(const char* str) {
#else return str ? __builtin_strlen(str) : 0;
strlen(str)
#endif
: 0;
} }
#else
static constexpr size_type StrLenInternal(const char* str) {
return str ? strlen(str) : 0;
}
#endif
static constexpr size_type CheckLengthInternal(size_type len) { static constexpr size_type CheckLengthInternal(size_type len) {
return ABSL_ASSERT(len <= kMaxSize), len; return ABSL_ASSERT(len <= kMaxSize), len;

1
absl/synchronization/BUILD.bazel
View file

@ -129,7 +129,6 @@ cc_library(
cc_test( cc_test(
name = "mutex_test", name = "mutex_test",
size = "large", size = "large",
timeout = "moderate",
srcs = ["mutex_test.cc"], srcs = ["mutex_test.cc"],
copts = ABSL_TEST_COPTS, copts = ABSL_TEST_COPTS,
tags = [ tags = [