Clean up the minor mess I caused with removing iterator.h. I shall take care of 80-col violations and the FIXME later. (Thanks goodness that I live in another continent, so the monkeypox did not strike me :-)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80224 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Gabor Greif
2009-08-27 06:41:46 +00:00
parent 199ba42cbf
commit f0891be8bd
18 changed files with 35 additions and 44 deletions

View File

@@ -16,7 +16,6 @@
#include "llvm/Target/TargetRegisterInfo.h"
#include "llvm/ADT/BitVector.h"
#include "llvm/ADT/iterator.h"
#include <vector>
namespace llvm {
@@ -256,7 +255,7 @@ public:
/// returns end().
template<bool ReturnUses, bool ReturnDefs>
class defusechain_iterator
: public forward_iterator<MachineInstr, ptrdiff_t> {
: public std::iterator<std::forward_iterator_tag, MachineInstr, ptrdiff_t> {
MachineOperand *Op;
explicit defusechain_iterator(MachineOperand *op) : Op(op) {
// If the first node isn't one we're interested in, advance to one that
@@ -269,8 +268,8 @@ public:
}
friend class MachineRegisterInfo;
public:
typedef forward_iterator<MachineInstr, ptrdiff_t>::reference reference;
typedef forward_iterator<MachineInstr, ptrdiff_t>::pointer pointer;
typedef std::iterator<std::forward_iterator_tag, MachineInstr, ptrdiff_t>::reference reference;
typedef std::iterator<std::forward_iterator_tag, MachineInstr, ptrdiff_t>::pointer pointer;
defusechain_iterator(const defusechain_iterator &I) : Op(I.Op) {}
defusechain_iterator() : Op(0) {}