summaryrefslogtreecommitdiff
path: root/absl/strings
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2018-08-20 08:18:32 -0700
committerGravatar Derek Mauro <dmauro@google.com>2018-08-20 11:24:03 -0400
commitd8cfe9f2a77fbee02c09642491e62a3f3677e0f6 (patch)
treea6fe361f6869140f7bf5aa2eb107470fa099d162 /absl/strings
parentad5c960b2eb914881d1ceba0e996a0a8f3f6ca59 (diff)
Export of internal Abseil changes.
-- c508ee8bcc38dad1019c0ad744c47ac70efd36b7 by Derek Mauro <dmauro@google.com>: Opensource the Linux specific SpinLock Wait/Wake implementation. PiperOrigin-RevId: 209420888 -- c13113e19973d496f3e798c0e6d5569c78e41466 by Derek Mauro <dmauro@google.com>: Fix build error from https://github.com/abseil/abseil-cpp/issues/159 PiperOrigin-RevId: 209152118 GitOrigin-RevId: c508ee8bcc38dad1019c0ad744c47ac70efd36b7 Change-Id: I1a287df973198f9e26936d8f91031bb354db0c71
Diffstat (limited to 'absl/strings')
-rw-r--r--absl/strings/str_cat_test.cc3
-rw-r--r--absl/strings/string_view_test.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/absl/strings/str_cat_test.cc b/absl/strings/str_cat_test.cc
index e9d67690..555d8db3 100644
--- a/absl/strings/str_cat_test.cc
+++ b/absl/strings/str_cat_test.cc
@@ -28,7 +28,8 @@
#define ABSL_EXPECT_DEBUG_DEATH(statement, regex) \
EXPECT_DEBUG_DEATH(statement, ".*")
#else
-#define ABSL_EXPECT_DEBUG_DEATH EXPECT_DEBUG_DEATH
+#define ABSL_EXPECT_DEBUG_DEATH(statement, regex) \
+ EXPECT_DEBUG_DEATH(statement, regex)
#endif
namespace {
diff --git a/absl/strings/string_view_test.cc b/absl/strings/string_view_test.cc
index fffa7b99..3818fb20 100644
--- a/absl/strings/string_view_test.cc
+++ b/absl/strings/string_view_test.cc
@@ -35,7 +35,8 @@
#define ABSL_EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
EXPECT_DEATH_IF_SUPPORTED(statement, ".*")
#else
-#define ABSL_EXPECT_DEATH_IF_SUPPORTED EXPECT_DEATH_IF_SUPPORTED
+#define ABSL_EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
+ EXPECT_DEATH_IF_SUPPORTED(statement, regex)
#endif
namespace {