diff options
4 files changed, 4 insertions, 4 deletions
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); } }; diff --git a/clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p1.cpp b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p1.cpp new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p1.cpp diff --git a/clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p3.cpp b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p3.cpp new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p3.cpp diff --git a/clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p5-var.cpp b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p5-var.cpp new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p5-var.cpp |
