summaryrefslogtreecommitdiffstats
path: root/test/FixIt
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2017-08-14 17:27:59 +0000
committerHans Wennborg <hans@hanshq.net>2017-08-14 17:27:59 +0000
commitb52dc49165b05501903ea7355e646467da025c3a (patch)
tree69532f7472fe1c5ed531c46afdb60e63b3d1a803 /test/FixIt
parent63c6fd256d0bccded905f0b05158939291d3f151 (diff)
Merging r310804:
------------------------------------------------------------------------ r310804 | rsmith | 2017-08-13 15:26:53 -0700 (Sun, 13 Aug 2017) | 2 lines Replace remaining user-visible mentions of C++1z with C++17. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_50@310862 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/FixIt')
-rw-r--r--test/FixIt/fixit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/FixIt/fixit.cpp b/test/FixIt/fixit.cpp
index 0b7fc626ff..92c561a20a 100644
--- a/test/FixIt/fixit.cpp
+++ b/test/FixIt/fixit.cpp
@@ -216,7 +216,7 @@ template<class T> typedef Mystery<T>::type getMysteriousThing() { // \
}
template<template<typename> Foo, // expected-error {{template template parameter requires 'class' after the parameter list}}
- template<typename> typename Bar, // expected-warning {{template template parameter using 'typename' is a C++1z extension}}
+ template<typename> typename Bar, // expected-warning {{template template parameter using 'typename' is a C++17 extension}}
template<typename> struct Baz> // expected-error {{template template parameter requires 'class' after the parameter list}}
void func();