diff --git a/include/llvm/ADT/SmallVector.h b/include/llvm/ADT/SmallVector.h index 2a5168c261f..0a4140e8f82 100644 --- a/include/llvm/ADT/SmallVector.h +++ b/include/llvm/ADT/SmallVector.h @@ -14,6 +14,7 @@ #ifndef LLVM_ADT_SMALLVECTOR_H #define LLVM_ADT_SMALLVECTOR_H +#include "llvm/ADT/iterator_range.h" #include "llvm/Support/AlignOf.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/MathExtras.h" @@ -870,6 +871,12 @@ public: this->append(S, E); } + template + explicit SmallVector(const llvm::iterator_range R) + : SmallVectorImpl(N) { + this->append(R.begin(), R.end()); + } + SmallVector(const SmallVector &RHS) : SmallVectorImpl(N) { if (!RHS.empty()) SmallVectorImpl::operator=(RHS); diff --git a/include/llvm/ADT/iterator_range.h b/include/llvm/ADT/iterator_range.h index b8ee75a8d4d..4f2f3218f31 100644 --- a/include/llvm/ADT/iterator_range.h +++ b/include/llvm/ADT/iterator_range.h @@ -19,17 +19,10 @@ #ifndef LLVM_ADT_ITERATOR_RANGE_H #define LLVM_ADT_ITERATOR_RANGE_H -#include -#include #include namespace llvm { -template -struct range_traits { - typedef typename Range::difference_type difference_type; -}; - /// \brief A range adaptor for a pair of iterators. /// /// This just wraps two iterators into a range-compatible interface. Nothing @@ -39,10 +32,6 @@ class iterator_range { IteratorT begin_iterator, end_iterator; public: - // FIXME: We should be using iterator_traits to determine the - // difference_type, but most of our iterators do not expose anything like it. - typedef int difference_type; - iterator_range() {} iterator_range(IteratorT begin_iterator, IteratorT end_iterator) : begin_iterator(std::move(begin_iterator)), @@ -51,20 +40,6 @@ public: IteratorT begin() const { return begin_iterator; } IteratorT end() const { return end_iterator; } }; - -/// \brief Determine the distance between the end() and begin() iterators of -/// a range. Analogous to std::distance(). -template -typename range_traits::difference_type distance(Range R) { - return std::distance(R.begin(), R.end()); -} - -/// \brief Copies members of a range into the output iterator provided. -/// Analogous to std::copy. -template -OutputIterator copy(Range In, OutputIterator Result) { - return std::copy(In.begin(), In.end(), Result); -} } #endif