From 463abbb4a77cc4ff91fea585faec6814e323deec Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Thu, 21 Feb 2013 23:15:05 +0000 Subject: [PATCH] Fix typo 'with with' in diagnostic. llvm-svn: 175823 --- clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 +- clang/test/Sema/attr-regparm.c | 2 +- clang/test/SemaCXX/attr-regparm.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 64e4eab..5e30b2e 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -1891,7 +1891,7 @@ def err_cconv_knr : Error< "function with no prototype cannot use %0 calling convention">; def err_cconv_varargs : Error< "variadic function cannot use %0 calling convention">; -def err_regparm_mismatch : Error<"function declared with with regparm(%0) " +def err_regparm_mismatch : Error<"function declared with regparm(%0) " "attribute was previously declared " "%plural{0:without the regparm|:with the regparm(%1)}1 attribute">; def err_returns_retained_mismatch : Error< diff --git a/clang/test/Sema/attr-regparm.c b/clang/test/Sema/attr-regparm.c index 642c07e..ccd894e 100644 --- a/clang/test/Sema/attr-regparm.c +++ b/clang/test/Sema/attr-regparm.c @@ -8,4 +8,4 @@ __attribute((regparm(5,3))) int x4(void); // expected-error{{attribute takes one void __attribute__((regparm(3))) x5(int); void x5(int); // expected-note{{previous declaration is here}} -void __attribute__((regparm(2))) x5(int); // expected-error{{function declared with with regparm(2) attribute was previously declared with the regparm(3) attribute}} +void __attribute__((regparm(2))) x5(int); // expected-error{{function declared with regparm(2) attribute was previously declared with the regparm(3) attribute}} diff --git a/clang/test/SemaCXX/attr-regparm.cpp b/clang/test/SemaCXX/attr-regparm.cpp index 91ee613..92e651b 100644 --- a/clang/test/SemaCXX/attr-regparm.cpp +++ b/clang/test/SemaCXX/attr-regparm.cpp @@ -11,5 +11,5 @@ struct X0 { void X0::f0() { } void __attribute__((regparm(3))) X0::f1() { } -void __attribute__((regparm(2))) X0::f2() { } // expected-error{{function declared with with regparm(2) attribute was previously declared with the regparm(3) attribute}} -void __attribute__((regparm(2))) X0::f3() { } // expected-error{{function declared with with regparm(2) attribute was previously declared without the regparm attribute}} +void __attribute__((regparm(2))) X0::f2() { } // expected-error{{function declared with regparm(2) attribute was previously declared with the regparm(3) attribute}} +void __attribute__((regparm(2))) X0::f3() { } // expected-error{{function declared with regparm(2) attribute was previously declared without the regparm attribute}} -- 2.7.4