aboutsummaryrefslogtreecommitdiff
path: root/test/Modules/Inputs/redecl-merge-left.h
diff options
context:
space:
mode:
Diffstat (limited to 'test/Modules/Inputs/redecl-merge-left.h')
-rw-r--r--test/Modules/Inputs/redecl-merge-left.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/test/Modules/Inputs/redecl-merge-left.h b/test/Modules/Inputs/redecl-merge-left.h
index b3a7ba83c1af..5e6d2e512b00 100644
--- a/test/Modules/Inputs/redecl-merge-left.h
+++ b/test/Modules/Inputs/redecl-merge-left.h
@@ -60,7 +60,7 @@ typedef int T1;
typedef float T2;
int func0(int);
-int func1(int);
+int func1(int x) { return x; }
int func2(int);
@@ -78,12 +78,6 @@ extern float var2;
extern double var3;
-#ifdef __cplusplus
-template<typename T> class Vector;
-
-template<typename T> class Vector;
-#endif
-
// Make sure this doesn't introduce an ambiguity-creating 'id' at the
// top level.
typedef void funcptr_with_id(int id);