[cfe-commits] r167355 - /cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp

NAKAMURA Takumi geek4civic at gmail.com
Sat Nov 3 06:59:36 PDT 2012


Author: chapuni
Date: Sat Nov  3 08:59:36 2012
New Revision: 167355

URL: http://llvm.org/viewvc/llvm-project?rev=167355&view=rev
Log:
StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp: Appease msvc.

0 (as nullptr) is incompatible to pointer in type matching on msvc.

Modified:
    cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp

Modified: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp?rev=167355&r1=167354&r2=167355&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp Sat Nov  3 08:59:36 2012
@@ -99,7 +99,7 @@
     }
 
     if (Node->pred_empty())
-      return std::pair<const Stmt*, const CFGBlock*>(0, 0);
+      return std::pair<const Stmt*, const CFGBlock*>((Stmt*)0, (CFGBlock*)0);
 
     Node = *Node->pred_begin();
   }
@@ -116,7 +116,7 @@
         break;
       }
       if (Node->pred_empty())
-        return std::pair<const Stmt*, const CFGBlock*>(S, 0);
+        return std::pair<const Stmt*, const CFGBlock*>(S, (CFGBlock*)0);
 
       Node = *Node->pred_begin();
     }





More information about the cfe-commits mailing list