Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/iterator.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/boost/iterator.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/iterator.hpp | 45 |
1 files changed, 3 insertions, 42 deletions
diff --git a/3rdParty/Boost/src/boost/iterator.hpp b/3rdParty/Boost/src/boost/iterator.hpp index 6adab0e..c9c6197 100644 --- a/3rdParty/Boost/src/boost/iterator.hpp +++ b/3rdParty/Boost/src/boost/iterator.hpp @@ -1,59 +1,20 @@ -// iterator.hpp workarounds for non-conforming standard libraries ---------// - // (C) Copyright Beman Dawes 2000. Distributed under the Boost // Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// See http://www.boost.org/libs/utility for documentation. - -// Revision History -// 12 Jan 01 added <cstddef> for std::ptrdiff_t (Jens Maurer) -// 28 Jun 00 Workarounds to deal with known MSVC bugs (David Abrahams) -// 26 Jun 00 Initial version (Jeremy Siek) - #ifndef BOOST_ITERATOR_HPP #define BOOST_ITERATOR_HPP +// This header is obsolete and will be deprecated. + #include <iterator> #include <cstddef> // std::ptrdiff_t -#include <boost/config.hpp> namespace boost { -# if defined(BOOST_NO_STD_ITERATOR) && !defined(BOOST_MSVC_STD_ITERATOR) - template <class Category, class T, - class Distance = std::ptrdiff_t, - class Pointer = T*, class Reference = T&> - struct iterator - { - typedef T value_type; - typedef Distance difference_type; - typedef Pointer pointer; - typedef Reference reference; - typedef Category iterator_category; - }; -# else - // declare iterator_base in namespace detail to work around MSVC bugs which - // prevent derivation from an identically-named class in a different namespace. - namespace detail { - template <class Category, class T, class Distance, class Pointer, class Reference> -# if !defined(BOOST_MSVC_STD_ITERATOR) - struct iterator_base : std::iterator<Category, T, Distance, Pointer, Reference> {}; -# else - struct iterator_base : std::iterator<Category, T, Distance> - { - typedef Reference reference; - typedef Pointer pointer; - typedef Distance difference_type; - }; -# endif - } +using std::iterator; - template <class Category, class T, class Distance = std::ptrdiff_t, - class Pointer = T*, class Reference = T&> - struct iterator : boost::detail::iterator_base<Category, T, Distance, Pointer, Reference> {}; -# endif } // namespace boost #endif // BOOST_ITERATOR_HPP |