[cfe-commits] r167199 - /cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h

[Jordan Rose]

Wondering if 0 is perhaps more appropriate than a cast, but either way, thanks, Takumi.


On Oct 31, 2012, at 18:47 , NAKAMURA Takumi <geek4civic at gmail.com> wrote:

> Author: chapuni
> Date: Wed Oct 31 20:47:02 2012
> New Revision: 167199
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=167199&view=rev
> Log:
> clang/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h: Appease msvc.
> 
> Modified:
>    cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
> 
> Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h?rev=167199&r1=167198&r2=167199&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h (original)
> +++ cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h Wed Oct 31 20:47:02 2012
> @@ -81,7 +81,7 @@
>       // FIXME: This is fairly expensive and should be disabled even in
>       // Release+Asserts builds.
>       assert(assume(State, Cond, false) && "System is over constrained.");
> -      return ProgramStatePair(NULL, State);
> +      return ProgramStatePair((ProgramStateRef)NULL, State);
>     }
> 
>     ProgramStateRef StFalse = assume(State, Cond, false);
> @@ -89,7 +89,7 @@
>       // We are careful to return the original state, /not/ StTrue,
>       // because we want to avoid having callers generate a new node
>       // in the ExplodedGraph.
> -      return ProgramStatePair(State, NULL);
> +      return ProgramStatePair(State, (ProgramStateRef)NULL);
>     }
> 
>     return ProgramStatePair(StTrue, StFalse);
> 
> 
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits