From 5f25b7dab5e61dcadc5e841669ef8cdaa2d6966e Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Fri, 30 Sep 2016 14:18:06 +0000 Subject: [PATCH] Fix int <= bool comparison warning on MSVC git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@282857 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaExprCXX.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp index 237bdbf89c..1e116e3522 100644 --- a/lib/Sema/SemaExprCXX.cpp +++ b/lib/Sema/SemaExprCXX.cpp @@ -2366,11 +2366,14 @@ void Sema::DeclareGlobalNewDelete() { bool HasSizedVariant = getLangOpts().SizedDeallocation && (Kind == OO_Delete || Kind == OO_Array_Delete); bool HasAlignedVariant = getLangOpts().CPlusPlus1z; - for (int Sized = 0; Sized <= HasSizedVariant; ++Sized) { + + int NumSizeVariants = (HasSizedVariant ? 2 : 1); + int NumAlignVariants = (HasAlignedVariant ? 2 : 1); + for (int Sized = 0; Sized < NumSizeVariants; ++Sized) { if (Sized) Params.push_back(SizeT); - for (int Aligned = 0; Aligned <= HasAlignedVariant; ++Aligned) { + for (int Aligned = 0; Aligned < NumAlignVariants; ++Aligned) { if (Aligned) Params.push_back(Context.getTypeDeclType(getStdAlignValT())); -- 2.50.1