summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2013-08-15 18:58:00 +0000
committerFariborz Jahanian <fjahanian@apple.com>2013-08-15 18:58:00 +0000
commit0b48e7c6bd8368232322ab484708577483a54996 (patch)
tree24cf5c35af081c4914f564e6c90c39c6b6dc3b88
parent444c59e270b65a1e5040231bf3b27b9577c4ee2d (diff)
downloadbcm5719-llvm-0b48e7c6bd8368232322ab484708577483a54996.tar.gz
bcm5719-llvm-0b48e7c6bd8368232322ab484708577483a54996.zip
Fixes a gross conditional in my last patch.
- This line, and those below, will be ignored-- M lib/ARCMigrate/ObjCMT.cpp llvm-svn: 188473
-rw-r--r--clang/lib/ARCMigrate/ObjCMT.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/ARCMigrate/ObjCMT.cpp b/clang/lib/ARCMigrate/ObjCMT.cpp
index 05a81393eab..1e050ac138e 100644
--- a/clang/lib/ARCMigrate/ObjCMT.cpp
+++ b/clang/lib/ARCMigrate/ObjCMT.cpp
@@ -515,7 +515,7 @@ static bool UseNSOptionsMacro(ASTContext &Ctx,
MaxPowerOfTwoVal = EnumVal;
}
}
- return PowerOfTwo ? ((MaxPowerOfTwoVal > 2) ? true : false) : false;
+ return PowerOfTwo && (MaxPowerOfTwoVal > 2);
}
void ObjCMigrateASTConsumer::migrateProtocolConformance(ASTContext &Ctx,
OpenPOWER on IntegriCloud