diff options
| author | Simon Pilgrim <llvm-dev@redking.me.uk> | 2016-09-30 14:18:06 +0000 |
|---|---|---|
| committer | Simon Pilgrim <llvm-dev@redking.me.uk> | 2016-09-30 14:18:06 +0000 |
| commit | d69fc8ea02ac90922e6e866217274f2ec5d2718d (patch) | |
| tree | abfe031e9c26ec74187815611bbd4d1de2ef8352 /clang/lib/Sema/SemaExprCXX.cpp | |
| parent | 4a25499b13925b71b8cb6830d5864af3fe8ea7c2 (diff) | |
| download | bcm5719-llvm-d69fc8ea02ac90922e6e866217274f2ec5d2718d.tar.gz bcm5719-llvm-d69fc8ea02ac90922e6e866217274f2ec5d2718d.zip | |
Fix int <= bool comparison warning on MSVC
llvm-svn: 282857
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index 237bdbf89cf..1e116e35227 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/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())); |
