aboutsummaryrefslogtreecommitdiff
path: root/paludis/util/indirect_iterator.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 10:11:47 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 18:54:57 +0100
commit7a8a792ae878e2b432e0c67a813022117faa4e60 (patch)
treed9eac8e45ccc206bc6920d14e25f5613b54be02f /paludis/util/indirect_iterator.hh
parent34700872057c99c57416612fbc264c48cfd38f9d (diff)
downloadpaludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.gz
paludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.xz
No more tr1:: and tr1/
Diffstat (limited to 'paludis/util/indirect_iterator.hh')
-rw-r--r--paludis/util/indirect_iterator.hh18
1 files changed, 9 insertions, 9 deletions
diff --git a/paludis/util/indirect_iterator.hh b/paludis/util/indirect_iterator.hh
index 78259978b..06d1d05a2 100644
--- a/paludis/util/indirect_iterator.hh
+++ b/paludis/util/indirect_iterator.hh
@@ -22,9 +22,9 @@
#include <paludis/util/indirect_iterator-fwd.hh>
#include <paludis/util/operators.hh>
-#include <tr1/memory>
-#include <tr1/functional>
-#include <tr1/type_traits>
+#include <memory>
+#include <functional>
+#include <type_traits>
namespace paludis
{
@@ -41,13 +41,13 @@ namespace paludis
};
template <typename T_>
- struct IndirectIteratorValueType<std::tr1::shared_ptr<T_> >
+ struct IndirectIteratorValueType<std::shared_ptr<T_> >
{
typedef T_ Type;
};
template <typename T_>
- struct IndirectIteratorValueType<std::tr1::shared_ptr<const T_> >
+ struct IndirectIteratorValueType<std::shared_ptr<const T_> >
{
typedef const T_ Type;
};
@@ -65,7 +65,7 @@ namespace paludis
};
/**
- * An IndirectIterator turns an iterator over T_ * or std::tr1::shared_ptr<T_> into an iterator
+ * An IndirectIterator turns an iterator over T_ * or std::shared_ptr<T_> into an iterator
* over T_.
*
* \ingroup g_iterator
@@ -96,9 +96,9 @@ namespace paludis
///\name Standard library typedefs
///\{
- typedef typename std::tr1::remove_reference<Value_>::type & value_type;
- typedef typename std::tr1::remove_reference<Value_>::type & reference;
- typedef typename std::tr1::remove_reference<Value_>::type * pointer;
+ typedef typename std::remove_reference<Value_>::type & value_type;
+ typedef typename std::remove_reference<Value_>::type & reference;
+ typedef typename std::remove_reference<Value_>::type * pointer;
typedef std::ptrdiff_t difference_type;
typedef std::forward_iterator_tag iterator_category;