Some cleanups for C++ operator overloading

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59443 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/SemaCXX/overloaded-operator-decl.cpp b/test/SemaCXX/overloaded-operator-decl.cpp
index 634f3d4..8a042f6 100644
--- a/test/SemaCXX/overloaded-operator-decl.cpp
+++ b/test/SemaCXX/overloaded-operator-decl.cpp
@@ -12,7 +12,7 @@
   void operator()(int x = 17) const;
   int operator[](int);
 
-  static int operator+(Y, Y); // expected-error{{overloaded operator 'operator+' cannot be a static member function}}
+  static int operator+(Y, Y); // expected-error{{overloaded 'operator+' cannot be a static member function}}
 };
 
 
@@ -20,15 +20,15 @@
   x = operator+(x, x);
 }
 
-X operator+(int, float); // expected-error{{non-member overloaded operator 'operator+' must have at least one parameter of class or enumeration type (or reference thereof)}}
+X operator+(int, float); // expected-error{{overloaded 'operator+' must have at least one parameter of class or enumeration type}}
 
-X operator*(X, X = 5); // expected-error{{a parameter of an overloaded operator cannot have a default argument}}
+X operator*(X, X = 5); // expected-error{{parameter of overloaded 'operator*' cannot have a default argument}}
 
-X operator/(X, X, ...); // expected-error{{overloaded operator cannot be variadic}}
+X operator/(X, X, ...); // expected-error{{overloaded 'operator/' cannot be variadic}}
 
-X operator%(Y); // expected-error{{overloaded operator 'operator%' must be a binary operator (has 1 parameter)}}
+X operator%(Y); // expected-error{{overloaded 'operator%' must be a binary operator (has 1 parameter)}}
 
-void operator()(Y&, int, int); // expected-error{{overloaded operator 'operator()' must be a non-static member function}}
+void operator()(Y&, int, int); // expected-error{{overloaded 'operator()' must be a non-static member function}}
 
 typedef int INT;
 typedef float FLOAT;