summaryrefslogtreecommitdiffstats
path: root/clang/test/SemaCXX/function-redecl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'clang/test/SemaCXX/function-redecl.cpp')
-rw-r--r--clang/test/SemaCXX/function-redecl.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/clang/test/SemaCXX/function-redecl.cpp b/clang/test/SemaCXX/function-redecl.cpp
index deb8e9d37fd..2bc0d90cd62 100644
--- a/clang/test/SemaCXX/function-redecl.cpp
+++ b/clang/test/SemaCXX/function-redecl.cpp
@@ -4,17 +4,14 @@ int foo(int);
namespace N {
void f1() {
void foo(int); // okay
- void bar(int);
+ void bar(int); // expected-note 2{{previous declaration is here}}
}
void foo(int); // expected-note 2{{previous declaration is here}}
void f2() {
int foo(int); // expected-error {{functions that differ only in their return type cannot be overloaded}}
- // FIXME: We should be able to diagnose the conflict between this
- // declaration of 'bar' and the previous one, even though they come
- // from different lexical scopes.
- int bar(int); // expected-note {{previous declaration is here}}
+ int bar(int); // expected-error {{functions that differ only in their return type cannot be overloaded}}
int baz(int); // expected-note {{previous declaration is here}}
{
OpenPOWER on IntegriCloud