From 952eddef9aff85b1e92626e89baaf7a360e2ac85 Mon Sep 17 00:00:00 2001 From: dim Date: Sun, 22 Dec 2013 00:07:40 +0000 Subject: Vendor import of clang release_34 branch r197841 (effectively, 3.4 RC3): https://llvm.org/svn/llvm-project/cfe/branches/release_34@197841 --- test/SemaTemplate/constexpr-instantiate.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/SemaTemplate/constexpr-instantiate.cpp') diff --git a/test/SemaTemplate/constexpr-instantiate.cpp b/test/SemaTemplate/constexpr-instantiate.cpp index 80c4aaf..95d6c23 100644 --- a/test/SemaTemplate/constexpr-instantiate.cpp +++ b/test/SemaTemplate/constexpr-instantiate.cpp @@ -201,8 +201,8 @@ namespace NoInstantiationWhenSelectingOverload { int n; }; - void f(S); - void f(int); + int f(S); + int f(int); void g() { f(0); } void h() { (void)sizeof(f(0)); } -- cgit v1.1