diff options
Diffstat (limited to 'clang/test/Modules/merge-enumerators.cpp')
-rw-r--r-- | clang/test/Modules/merge-enumerators.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/clang/test/Modules/merge-enumerators.cpp b/clang/test/Modules/merge-enumerators.cpp index 5267ac658b8..10e1914bd7b 100644 --- a/clang/test/Modules/merge-enumerators.cpp +++ b/clang/test/Modules/merge-enumerators.cpp @@ -16,11 +16,13 @@ #ifdef MERGE_LATE namespace N { - // FIXME: Should we accept this and reject the usage below due to ambiguity instead? - enum { A } a; // expected-error {{redefinition of enumerator 'A'}} - // expected-note@a.h:1 {{here}} (from module B.b) + enum { A } a; // expected-note {{candidate}} + // expected-note@a.h:1 {{candidate}} (from module B.b) } #include "a.h" #endif N::E e = N::A; +#ifdef MERGE_LATE +// expected-error@-2 {{ambiguous}} +#endif |