aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2009-06-22 16:33:37 +0000
committerFariborz Jahanian <fjahanian@apple.com>2009-06-22 16:33:37 +0000
commitc1005ac71f48ac8637ff1193a2ad9d6eb67fcf3d (patch)
tree9bf9d415d4fe36c2abb33c4d39a4dfa0385a2cc2
parent99823a7946ed7febd56beee8343aa2949144ce71 (diff)
Fixed text of a diagnostics.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@73885 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/clang/Basic/DiagnosticSemaKinds.td4
-rw-r--r--test/SemaCXX/default-constructor-initializers.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 755cfce4d8..994c2b9131 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -580,8 +580,8 @@ def err_param_default_argument_nonfunc : Error<
"default arguments can only be specified for parameters in a function "
"declaration">;
def err_defining_default_ctor : Error<
- "cannot define the default constructor for %0, because %select{base class|member}1 "
- "%2 does not have any implicit default constructor">;
+ "cannot define the implicit default constructor for %0, because %select{base class|member}1 "
+ "%2 does not have any default constructor">;
def note_previous_class_decl : Note<
"%0 declared here">;
def err_unintialized_member : Error<
diff --git a/test/SemaCXX/default-constructor-initializers.cpp b/test/SemaCXX/default-constructor-initializers.cpp
index c5250f8912..24c5383962 100644
--- a/test/SemaCXX/default-constructor-initializers.cpp
+++ b/test/SemaCXX/default-constructor-initializers.cpp
@@ -11,7 +11,7 @@ struct X2 : X1 { // expected-note {{'struct X2' declared here}} \
struct X3 : public X2 {
};
-X3 x3; // expected-error {{cannot define the default constructor for 'struct X3', because member 'struct X2' does not have any implicit default constructor}}
+X3 x3; // expected-error {{cannot define the implicit default constructor for 'struct X3', because member 'struct X2' does not have any default constructor}}
struct X4 {
@@ -19,7 +19,7 @@ struct X4 {
X2 & rx2; // expected-note {{declared at}}
};
-X4 x4; // expected-error {{cannot define the default constructor for 'struct X4', because base class 'struct X2' does not have any implicit default constructor}} \
+X4 x4; // expected-error {{cannot define the implicit default constructor for 'struct X4', because base class 'struct X2' does not have any default constructor}} \
// expected-error {{cannot define the implicit default constructor for 'struct X4', because reference member rx2 cannot be default-initialized}}