summaryrefslogtreecommitdiffstats
path: root/clang/test/SemaCXX/namespace.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'clang/test/SemaCXX/namespace.cpp')
-rw-r--r--clang/test/SemaCXX/namespace.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/clang/test/SemaCXX/namespace.cpp b/clang/test/SemaCXX/namespace.cpp
index 62251d3535e..848dc276715 100644
--- a/clang/test/SemaCXX/namespace.cpp
+++ b/clang/test/SemaCXX/namespace.cpp
@@ -1,18 +1,18 @@
// RUN: clang -fsyntax-only -verify %s
-namespace A { // expected-error {{error: previous definition is here}}
+namespace A { // expected-note {{previous definition is here}}
int A;
void f() { A = 0; }
}
-void f() { A = 0; } // expected-error {{error: unexpected namespace name 'A': expected expression}}
-int A; // expected-error {{error: redefinition of 'A' as different kind of symbol}}
-class A; // expected-error {{error: redefinition of 'A' as different kind of symbol}}
+void f() { A = 0; } // expected-error {{unexpected namespace name 'A': expected expression}}
+int A; // expected-error {{redefinition of 'A' as different kind of symbol}}
+class A; // expected-error {{redefinition of 'A' as different kind of symbol}}
-class B {}; // expected-error {{error: previous definition is here}}
-namespace B {} // expected-error {{error: redefinition of 'B' as different kind of symbol}}
+class B {}; // expected-note {{previous definition is here}}
+namespace B {} // expected-error {{redefinition of 'B' as different kind of symbol}}
-void C(); // expected-error {{error: previous definition is here}}
-namespace C {} // expected-error {{error: redefinition of 'C' as different kind of symbol}}
+void C(); // expected-note {{previous definition is here}}
+namespace C {} // expected-error {{redefinition of 'C' as different kind of symbol}}
namespace D {
class D {};
@@ -38,7 +38,7 @@ namespace S1 {
namespace S3 {
void f() {
- x = 0; // expected-error {{error: incompatible type assigning 'int', expected 'class B'}}
+ x = 0; // expected-error {{incompatible type assigning 'int', expected 'class B'}}
}
}
OpenPOWER on IntegriCloud