diff options
author | Paul Robinson <paul.robinson@sony.com> | 2016-12-19 18:00:45 +0000 |
---|---|---|
committer | Paul Robinson <paul.robinson@sony.com> | 2016-12-19 18:00:45 +0000 |
commit | 79bc5296097055e24cc31ac529556b187c104937 (patch) | |
tree | 1dd24e17dffd8cdf6a32684c7a17cdc2d47a41b9 /test/FixIt | |
parent | 41deb1fc6bc56ce0a68b0f008d876c9bd42f4165 (diff) |
Undo accidental comit
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@290121 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/FixIt')
-rw-r--r-- | test/FixIt/fixit.cpp | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/test/FixIt/fixit.cpp b/test/FixIt/fixit.cpp index 57a1c54851..686cc23d63 100644 --- a/test/FixIt/fixit.cpp +++ b/test/FixIt/fixit.cpp @@ -1,12 +1,8 @@ -// RUN: %clang_cc1 -pedantic -Wall -Wno-comment -verify -fcxx-exceptions -x c++ -std=c++98 %s -// RUN: cp %s %t-98 -// RUN: not %clang_cc1 -pedantic -Wall -Wno-comment -fcxx-exceptions -fixit -x c++ -std=c++98 %t-98 -// RUN: %clang_cc1 -fsyntax-only -pedantic -Wall -Werror -Wno-comment -fcxx-exceptions -x c++ -std=c++98 %t-98 +// RUN: %clang_cc1 -pedantic -Wall -Wno-comment -verify -fcxx-exceptions -x c++ %s // RUN: not %clang_cc1 -fsyntax-only -fdiagnostics-parseable-fixits -x c++ -std=c++11 %s 2>&1 | FileCheck %s -// RUN: %clang_cc1 -pedantic -Wall -Wno-comment -verify -fcxx-exceptions -x c++ -std=c++11 %s -// RUN: cp %s %t-11 -// RUN: not %clang_cc1 -pedantic -Wall -Wno-comment -fcxx-exceptions -fixit -x c++ -std=c++11 %t-11 -// RUN: %clang_cc1 -fsyntax-only -pedantic -Wall -Werror -Wno-comment -fcxx-exceptions -x c++ -std=c++11 %t-11 +// RUN: cp %s %t +// RUN: not %clang_cc1 -pedantic -Wall -Wno-comment -fcxx-exceptions -fixit -x c++ %t +// RUN: %clang_cc1 -fsyntax-only -pedantic -Wall -Werror -Wno-comment -fcxx-exceptions -x c++ %t /* This is a test of the various code modification hints that are provided as part of warning or extension diagnostics. All of the @@ -25,10 +21,7 @@ static void C1::g() { } // expected-error{{'static' can only be specified inside template<int Value> struct CT { template<typename> struct Inner; }; // expected-note{{previous use is here}} -// In C++11 this gets 'expected unqualified-id' which fixit can't fix. -#if __cplusplus < 201103L CT<10 >> 2> ct; // expected-warning{{require parentheses}} -#endif class C3 { public: @@ -48,11 +41,7 @@ protected: }; class B : public A { -#if __cplusplus >= 201103L - A::foo; // expected-error{{ISO C++11 does not allow access declarations}} -#else A::foo; // expected-warning{{access declarations are deprecated}} -#endif }; void f() throw(); // expected-note{{previous}} @@ -296,10 +285,8 @@ namespace greatergreater { void (*p)() = &t<int>; (void)(&t<int>==p); // expected-error {{use '> ='}} (void)(&t<int>>=p); // expected-error {{use '> >'}} -#if __cplusplus < 201103L (void)(&t<S<int>>>=p); // expected-error {{use '> >'}} (Shr)&t<S<int>>>>=p; // expected-error {{use '> >'}} -#endif // FIXME: We correct this to '&t<int> > >= p;' not '&t<int> >>= p;' //(Shr)&t<int>>>=p; |