summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Lorenz <arphaman@gmail.com>2015-06-24 17:05:04 +0000
committerAlex Lorenz <arphaman@gmail.com>2015-06-24 17:05:04 +0000
commitcc0a73c5eba4414b9a5e9f09b77c3eaa8077c67e (patch)
tree0577619e797807fdd025377f42d34d65a6453bbe
parent4957e4057d1c8bcdf62c0b2901b4e69d0f7ae2cb (diff)
downloadbcm5719-llvm-cc0a73c5eba4414b9a5e9f09b77c3eaa8077c67e.tar.gz
bcm5719-llvm-cc0a73c5eba4414b9a5e9f09b77c3eaa8077c67e.zip
ADTTests: merge #ifdef checks from r240436.
This commit merges the #ifdef and #ifndef checks into one #if, as suggested by Duncan P. N. Exon Smith. llvm-svn: 240553
-rw-r--r--llvm/unittests/ADT/APSIntTest.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/llvm/unittests/ADT/APSIntTest.cpp b/llvm/unittests/ADT/APSIntTest.cpp
index 44430055e90..a9b3071d138 100644
--- a/llvm/unittests/ADT/APSIntTest.cpp
+++ b/llvm/unittests/ADT/APSIntTest.cpp
@@ -151,8 +151,7 @@ TEST(APSIntTest, FromString) {
EXPECT_EQ(APSInt("-1234").getExtValue(), -1234);
}
-#ifdef GTEST_HAS_DEATH_TEST
-#ifndef NDEBUG
+#if defined(GTEST_HAS_DEATH_TEST) && !defined(NDEBUG)
TEST(APSIntTest, StringDeath) {
EXPECT_DEATH(APSInt(""), "Invalid string length");
@@ -160,6 +159,5 @@ TEST(APSIntTest, StringDeath) {
}
#endif
-#endif
} // end anonymous namespace
OpenPOWER on IntegriCloud