[lunarglass] r1089 committed - Remove auto/nullptr from previous check in; the Linux test build rejec...

[lunar...@googlecode.com]

Revision: 1089
Author: jo...@lunarg.com
Date: Sun May 31 21:45:24 2015 UTC
Log: Remove auto/nullptr from previous check in; the Linux test build
rejected them.

https://code.google.com/p/lunarglass/source/detail?r=1089

Modified:
/trunk/Core/BottomTranslator.cpp

=======================================
--- /trunk/Core/BottomTranslator.cpp Sun May 31 21:29:58 2015 UTC
+++ /trunk/Core/BottomTranslator.cpp Sun May 31 21:45:24 2015 UTC
@@ -198,7 +198,7 @@
const llvm::SwitchInst* switchInst;
bool fallthrough(const llvm::BasicBlock* b)
{
- for (auto it = switchInst->case_begin(); it !=
switchInst->case_end(); ++it)
+ for (llvm::SwitchInst::ConstCaseIt it =
switchInst->case_begin(); it != switchInst->case_end(); ++it)
if (it.getCaseSuccessor() == b)
return true;
if (mergeBlock && mergeBlock !=
switchInst->getDefaultDest() && b == switchInst->getDefaultDest())
@@ -767,7 +767,7 @@
if (switchStack.size() > 0) {
if (switchStack.back().fallthrough(succ))
backEndTranslator->endCase(false);
- else if (switchStack.back().mergeBlock == nullptr) {
+ else if (switchStack.back().mergeBlock == 0) {
// Speculate that this branches to the merge block of a
switch statement.
switchStack.back().mergeBlock = succ;
backEndTranslator->endCase(true);