Test commit - minor terminology change to my recent patch suggested by John McCall

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@86442 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index a09f6a9005..887a4c4af4 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -3762,7 +3762,7 @@ Sema::CheckPointerTypesForAssignment(QualType lhsType, QualType rhsType) {
       } 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 @@ bool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy,
       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;