summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Foad <jay.foad@gmail.com>2011-06-14 12:59:25 +0000
committerJay Foad <jay.foad@gmail.com>2011-06-14 12:59:25 +0000
commit0b16695d9359991ba0d241c471cbcc727f0792f7 (patch)
tree6e771d60e3a0a14fb3af8071244515973dff3cb9
parent06ba7a68de167fc10cb6def56d029bcd2abaea5d (diff)
downloadbcm5719-llvm-0b16695d9359991ba0d241c471cbcc727f0792f7.tar.gz
bcm5719-llvm-0b16695d9359991ba0d241c471cbcc727f0792f7.zip
Hyphenate "argument-dependent".
llvm-svn: 132989
-rw-r--r--clang/include/clang/Basic/DiagnosticSemaKinds.td2
-rw-r--r--clang/test/SemaTemplate/dependent-names-no-std.cpp2
-rw-r--r--clang/test/SemaTemplate/dependent-names.cpp12
-rw-r--r--clang/test/SemaTemplate/instantiate-call.cpp2
-rw-r--r--clang/www/compatibility.html4
5 files changed, 11 insertions, 11 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index 5d5df5e1ac4..d7c352e5707 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -2180,7 +2180,7 @@ def err_undeclared_var_use : Error<"use of undeclared identifier %0">;
def note_dependent_var_use : Note<"must qualify identifier to find this "
"declaration in dependent base class">;
def err_not_found_by_two_phase_lookup : Error<"call to function %0 that is neither "
- "visible in the template definition nor found by argument dependent lookup">;
+ "visible in the template definition nor found by argument-dependent lookup">;
def note_not_found_by_two_phase_lookup : Note<"%0 should be declared prior to the "
"call site%select{| or in %2| or in an associated namespace of one of its arguments}1">;
def err_undeclared_use : Error<"use of undeclared %0">;
diff --git a/clang/test/SemaTemplate/dependent-names-no-std.cpp b/clang/test/SemaTemplate/dependent-names-no-std.cpp
index e9ac99faf65..2fb9d9909f7 100644
--- a/clang/test/SemaTemplate/dependent-names-no-std.cpp
+++ b/clang/test/SemaTemplate/dependent-names-no-std.cpp
@@ -11,7 +11,7 @@ namespace PR10053 {
template<typename T> struct A {
T t;
A() {
- f(t); // expected-error {{call to function 'f' that is neither visible in the template definition nor found by argument dependent lookup}}
+ f(t); // expected-error {{call to function 'f' that is neither visible in the template definition nor found by argument-dependent lookup}}
}
};
diff --git a/clang/test/SemaTemplate/dependent-names.cpp b/clang/test/SemaTemplate/dependent-names.cpp
index 2a50df5b7f1..f778bd9d2cd 100644
--- a/clang/test/SemaTemplate/dependent-names.cpp
+++ b/clang/test/SemaTemplate/dependent-names.cpp
@@ -148,7 +148,7 @@ namespace PR10053 {
template<typename T> struct A {
T t;
A() {
- f(t); // expected-error {{call to function 'f' that is neither visible in the template definition nor found by argument dependent lookup}}
+ f(t); // expected-error {{call to function 'f' that is neither visible in the template definition nor found by argument-dependent lookup}}
}
};
@@ -160,7 +160,7 @@ namespace PR10053 {
namespace N {
namespace M {
template<typename T> int g(T t) {
- f(t); // expected-error {{call to function 'f' that is neither visible in the template definition nor found by argument dependent lookup}}
+ f(t); // expected-error {{call to function 'f' that is neither visible in the template definition nor found by argument-dependent lookup}}
};
}
@@ -187,7 +187,7 @@ namespace PR10053 {
// Example from www/compatibility.html
namespace my_file {
template <typename T> T Squared(T x) {
- return Multiply(x, x); // expected-error {{neither visible in the template definition nor found by argument dependent lookup}}
+ return Multiply(x, x); // expected-error {{neither visible in the template definition nor found by argument-dependent lookup}}
}
int Multiply(int x, int y) { // expected-note {{should be declared prior to the call site}}
@@ -203,7 +203,7 @@ namespace PR10053 {
namespace my_file2 {
template<typename T>
void Dump(const T& value) {
- std::cout << value << "\n"; // expected-error {{neither visible in the template definition nor found by argument dependent lookup}}
+ std::cout << value << "\n"; // expected-error {{neither visible in the template definition nor found by argument-dependent lookup}}
}
namespace ns {
@@ -222,7 +222,7 @@ namespace PR10053 {
namespace my_file2_a {
template<typename T>
void Dump(const T &value) {
- print(std::cout, value); // expected-error 4{{neither visible in the template definition nor found by argument dependent lookup}}
+ print(std::cout, value); // expected-error 4{{neither visible in the template definition nor found by argument-dependent lookup}}
}
namespace ns {
@@ -248,7 +248,7 @@ namespace PR10053 {
namespace unary {
template<typename T>
T Negate(const T& value) {
- return !value; // expected-error {{call to function 'operator!' that is neither visible in the template definition nor found by argument dependent lookup}}
+ return !value; // expected-error {{call to function 'operator!' that is neither visible in the template definition nor found by argument-dependent lookup}}
}
namespace ns {
diff --git a/clang/test/SemaTemplate/instantiate-call.cpp b/clang/test/SemaTemplate/instantiate-call.cpp
index a0e48c8dec7..da1eb49eb89 100644
--- a/clang/test/SemaTemplate/instantiate-call.cpp
+++ b/clang/test/SemaTemplate/instantiate-call.cpp
@@ -25,7 +25,7 @@ namespace N3 {
struct call_f0 {
void test_f0(T t) {
Result &result = f0(t); // expected-error {{undeclared identifier}} \
- expected-error {{neither visible in the template definition nor found by argument dependent lookup}}
+ expected-error {{neither visible in the template definition nor found by argument-dependent lookup}}
}
};
}
diff --git a/clang/www/compatibility.html b/clang/www/compatibility.html
index b68a7663d4f..783758f3ac8 100644
--- a/clang/www/compatibility.html
+++ b/clang/www/compatibility.html
@@ -459,7 +459,7 @@ int main() {
<p>Clang complains:
-<pre> <b>my_file.cpp:2:10: <span class="error">error:</span> call to function 'Multiply' that is neither visible in the template definition nor found by argument dependent lookup</b>
+<pre> <b>my_file.cpp:2:10: <span class="error">error:</span> call to function 'Multiply' that is neither visible in the template definition nor found by argument-dependent lookup</b>
return Multiply(x, x);
<span class="caret"> ^</span>
<b>my_file.cpp:10:3: <span class="note">note:</span> in instantiation of function template specialization 'Squared&lt;int&gt;' requested here</b>
@@ -520,7 +520,7 @@ void Use() {
<p>Again, Clang complains:</p>
-<pre> <b>my_file2.cpp:5:13: <span class="error">error:</span> call to function 'operator&lt;&lt;' that is neither visible in the template definition nor found by argument dependent lookup</b>
+<pre> <b>my_file2.cpp:5:13: <span class="error">error:</span> call to function 'operator&lt;&lt;' that is neither visible in the template definition nor found by argument-dependent lookup</b>
std::cout &lt;&lt; value &lt;&lt; "\n";
<span class="caret"> ^</span>
<b>my_file2.cpp:17:3: <span class="error">note:</span> in instantiation of function template specialization 'Dump&lt;ns::Data&gt;' requested here</b>
OpenPOWER on IntegriCloud