summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2014-08-14 00:49:23 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2014-08-14 00:49:23 +0000
commit5c734ad844037462ebcc46542bc621cecb34b1e3 (patch)
tree28ed07f0fb88b04925f6163e7b0f068bc1e30dc5 /clang/lib
parent32e5d8f3c07fd49c98ea93e8a2b006d8db038cd2 (diff)
downloadbcm5719-llvm-5c734ad844037462ebcc46542bc621cecb34b1e3.tar.gz
bcm5719-llvm-5c734ad844037462ebcc46542bc621cecb34b1e3.zip
Sema: Permit nullptr template args in MSVC compat mode
This fixes a regression I caused back in r211766. llvm-svn: 215609
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Sema/SemaTemplate.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp
index d81f6513688..63581a44dbe 100644
--- a/clang/lib/Sema/SemaTemplate.cpp
+++ b/clang/lib/Sema/SemaTemplate.cpp
@@ -4189,7 +4189,7 @@ isNullPointerValueTemplateArgument(Sema &S, NonTypeTemplateParmDecl *Param,
if (Arg->isValueDependent() || Arg->isTypeDependent())
return NPV_NotNullPointer;
- if (!S.getLangOpts().CPlusPlus11 || S.getLangOpts().MSVCCompat)
+ if (!S.getLangOpts().CPlusPlus11)
return NPV_NotNullPointer;
// Determine whether we have a constant expression.
OpenPOWER on IntegriCloud