diff options
Diffstat (limited to 'libstdc++-v3/include/bits/stl_iterator.h')
| -rw-r--r-- | libstdc++-v3/include/bits/stl_iterator.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 7746aa2..f9425aa 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -1,6 +1,7 @@ // Iterators -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -66,6 +67,7 @@ #define _ITERATOR_H 1 #include <bits/cpp_type_traits.h> +#include <ext/type_traits.h> _GLIBCXX_BEGIN_NAMESPACE(std) @@ -653,10 +655,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // Allow iterator to const_iterator conversion template<typename _Iter> __normal_iterator(const __normal_iterator<_Iter, - typename std::__enable_if<_Container, - (std::__are_same<_Iter, - typename _Container::pointer>::__value) - >::__type>& __i) + typename __enable_if< + (std::__are_same<_Iter, typename _Container::pointer>::__value), + _Container>::__type>& __i) : _M_current(__i.base()) { } // Forward iterator requirements |