diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/CodeGen/CGExprScalar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/CodeGen/CGExprScalar.cpp b/clang/CodeGen/CGExprScalar.cpp index 639b907e027..023e907499b 100644 --- a/clang/CodeGen/CGExprScalar.cpp +++ b/clang/CodeGen/CGExprScalar.cpp @@ -19,7 +19,7 @@ #include "llvm/GlobalVariable.h" #include "llvm/Intrinsics.h" #include "llvm/Support/Compiler.h" -#include <stdarg.h> +#include <cstdarg> using namespace clang; using namespace CodeGen; @@ -948,8 +948,8 @@ VisitConditionalOperator(const ConditionalOperator *E) { // because we need the unconverted value if this is a GNU ?: expression with // missing middle value. Value *CondVal = CGF.EmitScalarExpr(E->getCond()); - Value *CondBoolVal = CGF.EmitScalarConversion(CondVal, E->getCond()->getType(), - CGF.getContext().BoolTy); + Value *CondBoolVal =CGF.EmitScalarConversion(CondVal, E->getCond()->getType(), + CGF.getContext().BoolTy); Builder.CreateCondBr(CondBoolVal, LHSBlock, RHSBlock); CGF.EmitBlock(LHSBlock); |

