From 94bb5e8d7556183f3634496c8fc4ee58f2b99e3d Mon Sep 17 00:00:00 2001
From: Douglas Gregor <dgregor@apple.com>
Date: Sun, 6 Dec 2009 21:27:58 +0000
Subject: PointerUnion == PointerUnion does not do what I thought it did. Also,
 fix a thinko in a PointerUnion::get call.

llvm-svn: 90719
---
 clang/lib/Sema/SemaCodeComplete.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'clang/lib')

diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
index c76b3733b0e..5f9bba0f8c8 100644
--- a/clang/lib/Sema/SemaCodeComplete.cpp
+++ b/clang/lib/Sema/SemaCodeComplete.cpp
@@ -222,7 +222,7 @@ public:
     if (NamedDecl *ND = DeclOrIterator.dyn_cast<NamedDecl *>())
       return reference(ND, SingleDeclIndex);
 
-    return *DeclOrIterator.get<DeclIndexPair*>();
+    return *DeclOrIterator.get<const DeclIndexPair*>();
   }
 
   pointer operator->() const {
@@ -230,13 +230,13 @@ public:
   }
 
   friend bool operator==(const iterator &X, const iterator &Y) {
-    return X.DeclOrIterator == Y.DeclOrIterator &&
+    return X.DeclOrIterator.getOpaqueValue()
+                                  == Y.DeclOrIterator.getOpaqueValue() &&
       X.SingleDeclIndex == Y.SingleDeclIndex;
   }
 
   friend bool operator!=(const iterator &X, const iterator &Y) {
-    return X.DeclOrIterator != Y.DeclOrIterator ||
-      X.SingleDeclIndex != Y.SingleDeclIndex;
+    return !(X == Y);
   }
 };
 
-- 
cgit v1.2.3