From: Alex Lorenz <arphaman@gmail.com>
Date: Wed, 24 Jun 2015 17:05:04 +0000 (+0000)
Subject: ADTTests: merge #ifdef checks from r240436.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0502ac4036922e00dcd61fe944687a54791056f1;p=oota-llvm.git

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.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240553 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/unittests/ADT/APSIntTest.cpp b/unittests/ADT/APSIntTest.cpp
index 44430055e90..a9b3071d138 100644
--- a/unittests/ADT/APSIntTest.cpp
+++ b/unittests/ADT/APSIntTest.cpp
@@ -151,15 +151,13 @@ 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");
   EXPECT_DEATH(APSInt("1a"), "Invalid character in digit string");
 }
 
-#endif
 #endif
 
 } // end anonymous namespace