[cfe-commits] r86442 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td lib/Sema/Sema.h lib/Sema/SemaExpr.cpp

[Sean Hunt]

Author: coppro
Date: Sun Nov  8 01:46:34 2009
New Revision: 86442

URL: http://llvm.org/viewvc/llvm-project?rev=86442&view=rev
Log:
Test commit - minor terminology change to my recent patch suggested by John McCall

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
    cfe/trunk/lib/Sema/Sema.h
    cfe/trunk/lib/Sema/SemaExpr.cpp

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=86442&r1=86441&r2=86442&view=diff

==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Sun Nov  8 01:46:34 2009
@@ -1839,8 +1839,8 @@
   "incompatible pointer types %2 %1, expected %0">;
 def ext_typecheck_convert_discards_qualifiers : ExtWarn<
   "%2 %1 discards qualifiers, expected %0">;
-def err_multi_pointer_qualifier_mismatch : Error<
-  "%2, %0 and %1 have different qualifiers in a multi-level pointer chain">;
+def err_nested_pointer_qualifier_mismatch : Error<
+  "%2, %0 and %1 have different qualifiers in nested pointer types">;
 def warn_incompatible_vectors : Warning<
   "incompatible vector types %2 %1, expected %0">,
   InGroup<VectorConversions>, DefaultIgnore;

Modified: cfe/trunk/lib/Sema/Sema.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.h?rev=86442&r1=86441&r2=86442&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/Sema.h (original)
+++ cfe/trunk/lib/Sema/Sema.h Sun Nov  8 01:46:34 2009
@@ -3486,11 +3486,11 @@
     /// c/v/r qualifiers, which we accept as an extension.
     CompatiblePointerDiscardsQualifiers,
     
-    /// IncompatibleMultiPointerQualifiers - The assignment is between two
-    /// multi-level pointer types, and the qualifiers other than the first two
+    /// IncompatibleNestedPointerQualifiers - The assignment is between two
+    /// nested pointer types, and the qualifiers other than the first two
     /// levels differ e.g. char ** -> const char **. We disallow this.
     /// FIXME: GCC only warns for this - should we do the same?
-    IncompatibleMultiPointerQualifiers,
+    IncompatibleNestedPointerQualifiers,
 
     /// IncompatibleVectors - The assignment is between two vector types that
     /// have the same size, which we accept as an extension.

Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=86442&r1=86441&r2=86442&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Sun Nov  8 01:46:34 2009
@@ -3762,7 +3762,7 @@
       } while (lhptee->isPointerType() && rhptee->isPointerType());
       
       if (lhptee.getUnqualifiedType() == rhptee.getUnqualifiedType())
-        return IncompatibleMultiPointerQualifiers;
+        return IncompatibleNestedPointerQualifiers;
     }
     
     // General pointer incompatibility takes priority over qualifiers.
@@ -6241,8 +6241,8 @@
       return false;
     DiagKind = diag::ext_typecheck_convert_discards_qualifiers;
     break;
-  case IncompatibleMultiPointerQualifiers:
-    DiagKind = diag::err_multi_pointer_qualifier_mismatch;
+  case IncompatibleNestedPointerQualifiers:
+    DiagKind = diag::err_nested_pointer_qualifier_mismatch;
     break;
   case IntToBlockPointer:
     DiagKind = diag::err_int_to_block_pointer;