summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaExprCXX.cpp
diff options
context:
space:
mode:
authorAaron Ballman <aaron@aaronballman.com>2017-12-04 20:27:34 +0000
committerAaron Ballman <aaron@aaronballman.com>2017-12-04 20:27:34 +0000
commitc351fba69e24ca65fb8c4ae3ce240642555495d7 (patch)
tree31152a9420f1881f2241277093a696858c852ed3 /clang/lib/Sema/SemaExprCXX.cpp
parent800259c98d6fe81fefabb38c01a79504f2652cf2 (diff)
downloadbcm5719-llvm-c351fba69e24ca65fb8c4ae3ce240642555495d7.tar.gz
bcm5719-llvm-c351fba69e24ca65fb8c4ae3ce240642555495d7.zip
Now that C++17 is official (https://www.iso.org/standard/68564.html), start changing the C++1z terminology over to C++17. NFC intended, these are all mechanical changes.
llvm-svn: 319688
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaExprCXX.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 3fe50db6edd..56b14ddd7fe 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -5750,7 +5750,7 @@ mergeExceptionSpecs(Sema &S, FunctionProtoType::ExceptionSpecInfo ESI1,
// happen in C++17, because it would mean we were computing the composite
// pointer type of dependent types, which should never happen.
if (EST1 == EST_ComputedNoexcept || EST2 == EST_ComputedNoexcept) {
- assert(!S.getLangOpts().CPlusPlus1z &&
+ assert(!S.getLangOpts().CPlusPlus17 &&
"computing composite pointer type of dependent types");
return FunctionProtoType::ExceptionSpecInfo();
}
OpenPOWER on IntegriCloud