diff options
Diffstat (limited to 'boost/iterator')
| -rw-r--r-- | boost/iterator/detail/facade_iterator_category.hpp | 5 | ||||
| -rw-r--r-- | boost/iterator/iterator_adaptor.hpp | 6 | ||||
| -rw-r--r-- | boost/iterator/iterator_facade.hpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/boost/iterator/detail/facade_iterator_category.hpp b/boost/iterator/detail/facade_iterator_category.hpp index 67fdf446b0..6db45e4539 100644 --- a/boost/iterator/detail/facade_iterator_category.hpp +++ b/boost/iterator/detail/facade_iterator_category.hpp @@ -4,6 +4,8 @@ #ifndef FACADE_ITERATOR_CATEGORY_DWA20031118_HPP # define FACADE_ITERATOR_CATEGORY_DWA20031118_HPP +# include <boost/core/use_default.hpp> + # include <boost/iterator/iterator_categories.hpp> # include <boost/mpl/or.hpp> // used in iterator_tag inheritance logic @@ -33,8 +35,7 @@ namespace boost { namespace iterators { -// forward declaration -struct use_default; +using boost::use_default; namespace detail { diff --git a/boost/iterator/iterator_adaptor.hpp b/boost/iterator/iterator_adaptor.hpp index f803fc65ed..db1c4daa3c 100644 --- a/boost/iterator/iterator_adaptor.hpp +++ b/boost/iterator/iterator_adaptor.hpp @@ -9,6 +9,8 @@ #include <boost/static_assert.hpp> +#include <boost/core/use_default.hpp> + #include <boost/iterator/iterator_categories.hpp> #include <boost/iterator/iterator_facade.hpp> #include <boost/iterator/detail/enable_if.hpp> @@ -35,12 +37,10 @@ namespace iterators { // Used as a default template argument internally, merely to // indicate "use the default", this can also be passed by users // explicitly in order to specify that the default should be used. - struct use_default; + using boost::use_default; } // namespace iterators -using iterators::use_default; - // the incompleteness of use_default causes massive problems for // is_convertible (naturally). This workaround is fortunately not // needed for vc6/vc7. diff --git a/boost/iterator/iterator_facade.hpp b/boost/iterator/iterator_facade.hpp index 225c53a231..b43e618f0a 100644 --- a/boost/iterator/iterator_facade.hpp +++ b/boost/iterator/iterator_facade.hpp @@ -16,7 +16,7 @@ #include <boost/iterator/detail/enable_if.hpp> #include <boost/static_assert.hpp> -#include <boost/utility/addressof.hpp> +#include <boost/core/addressof.hpp> #include <boost/type_traits/is_same.hpp> #include <boost/type_traits/add_const.hpp> |