6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-08 00:24:25 +00:00
Code Issues Projects Releases Wiki Activity

DenseMapIterator: Avoid explicitly declaring the copy ctor as this makes the copy assignment operator deprecated in C++11

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231093 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie
2015-03-03 18:29:23 +00:00
parent a33c652878
commit 88f45e5ecd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/llvm/ADT/DenseMap.h
View File

@ -1008,11 +1008,13 @@ public:
if (!NoAdvance) AdvancePastEmptyBuckets(); if (!NoAdvance) AdvancePastEmptyBuckets();
} }
// If IsConst is true this is a converting constructor from iterator to // Converting ctor from non-const iterators to const iterators. SFINAE'd out
// const_iterator and the default copy constructor is used. // for const iterator destinations so it doesn't end up as a user defined copy
// Otherwise this is a copy constructor for iterator. // constructor.
template <bool IsConstSrc,
typename = typename std::enable_if<!IsConstSrc && IsConst>::type>
DenseMapIterator( DenseMapIterator(
const DenseMapIterator<KeyT, ValueT, KeyInfoT, Bucket, false> &I) const DenseMapIterator<KeyT, ValueT, KeyInfoT, Bucket, IsConstSrc> &I)
: Ptr(I.Ptr), End(I.End) {} : Ptr(I.Ptr), End(I.End) {}
reference operator*() const { reference operator*() const {