diff options
| -rw-r--r-- | test/PCH/cxx-static_assert.cpp | 15 | ||||
| -rw-r--r-- | test/PCH/cxx-static_assert.h | 9 |
2 files changed, 12 insertions, 12 deletions
diff --git a/test/PCH/cxx-static_assert.cpp b/test/PCH/cxx-static_assert.cpp index 34409218ec..464da405c3 100644 --- a/test/PCH/cxx-static_assert.cpp +++ b/test/PCH/cxx-static_assert.cpp @@ -1,11 +1,20 @@ // Test this without pch. -// RUN: %clang_cc1 -include %S/cxx-static_assert.h -verify -std=c++0x %s +// RUN: %clang_cc1 -include %s -verify -std=c++0x %s // Test with pch. -// RUN: %clang_cc1 -x c++-header -std=c++0x -emit-pch -o %t %S/cxx-static_assert.h +// RUN: %clang_cc1 -std=c++0x -emit-pch -o %t %s // RUN: %clang_cc1 -include-pch %t -verify -std=c++0x %s -// expected-error {{static_assert failed "N is not 2!"}} +#ifndef HEADER +#define HEADER + +template<int N> struct T { + static_assert(N == 2, "N is not 2!"); // expected-error {{static_assert failed "N is not 2!"}} +}; + +#else T<1> t1; // expected-note {{in instantiation of template class 'T<1>' requested here}} T<2> t2; + +#endif diff --git a/test/PCH/cxx-static_assert.h b/test/PCH/cxx-static_assert.h deleted file mode 100644 index ba41ab8fed..0000000000 --- a/test/PCH/cxx-static_assert.h +++ /dev/null @@ -1,9 +0,0 @@ -// Header for PCH test cxx-static_assert.cpp - - - - - -template<int N> struct T { - static_assert(N == 2, "N is not 2!"); -}; |