RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 12:12:47 +01:00
Code Issues Projects Releases Wiki Activity

Removing llvm::distance and llvm::copy for iterator_range based on post-commit review feedback. Adding an explicit range-based constructor to SmallVector, which supersedes the llvm::copy functionality.

Browse Source 
llvm-svn: 203460
This commit is contained in:
Aaron Ballman 2014-03-10 13:43:46 +00:00
parent 4fff721d3a
commit 13c9ddc235
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/ADT/SmallVector.h
View File

@ -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 <typename RangeTy>
explicit SmallVector(const llvm::iterator_range<RangeTy> R)
: SmallVectorImpl<T>(N) {
this->append(R.begin(), R.end());
}
SmallVector(const SmallVector &RHS) : SmallVectorImpl<T>(N) {
if (!RHS.empty())
SmallVectorImpl<T>::operator=(RHS);

25
include/llvm/ADT/iterator_range.h
View File

@ -19,17 +19,10 @@
#ifndef LLVM_ADT_ITERATOR_RANGE_H
#define LLVM_ADT_ITERATOR_RANGE_H
#include <algorithm>
#include <iterator>
#include <utility>
namespace llvm {
template <typename Range>
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 <class Range>
typename range_traits<Range>::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 <class Range, class OutputIterator>
OutputIterator copy(Range In, OutputIterator Result) {
return std::copy(In.begin(), In.end(), Result);
}
}
#endif