From cc0a73c5eba4414b9a5e9f09b77c3eaa8077c67e Mon Sep 17 00:00:00 2001
From: Alex Lorenz <arphaman@gmail.com>
Date: Wed, 24 Jun 2015 17:05:04 +0000
Subject: [PATCH] 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
---
 llvm/unittests/ADT/APSIntTest.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/llvm/unittests/ADT/APSIntTest.cpp b/llvm/unittests/ADT/APSIntTest.cpp
index 4443005..a9b3071 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
-- 
2.7.4