mirror of
https://github.com/boostorg/iterator.git
synced 2025-05-09 23:23:54 +00:00
С++03 support was deprecated in 1.85 and now can be removed. This PR clears many of workarounds, which are no longer needed now. * Remove unused workaround macros (many of). * Remove BOOST_STATIC_ASSERT usages. * Minimize Boost::type_traits dependency (in favour of STL's type_traits). Closes https://github.com/boostorg/iterator/pull/82. Squashed commit of the following: commit 741a627b736ba81fe0054e5bf373141b04a8a597 Author: Georgy Guminov <gogagum@gmail.com> Date: Sat Jan 25 12:13:05 2025 +0300 Replace testers with standard metafunctions. commit bf4cce611454713f1c8e5f46a2c3e599c548656d Author: Georgy Guminov <gogagum@gmail.com> Date: Sat Jan 25 11:51:32 2025 +0300 Refactor is_lvalue_iterator.hpp. commit 8d080c6c58726269cf55aedd64aa239f7d098fc7 Author: Georgy Guminov <gogagum@gmail.com> Date: Sat Jan 25 10:27:32 2025 +0300 Remove more workarounds. commit 5a4ba24d361ac0676d2cce95fdff22824ecdc287 Author: Georgy Guminov <gogagum@gmail.com> Date: Sun Jan 19 16:38:30 2025 +0300 Fixes. commit fdfafce2b9a71b1d85cbc697983652788f1c4bb7 Author: Georgy Guminov <gogagum@gmail.com> Date: Sat Oct 26 15:06:43 2024 +0300 Remove BOOST_NO_STRICT_ITERATOR_INTEROPERABILITY Correct static_assert messages. Fix messages & replace is_standard_layout with is_copy_constructible. commit c69ac1408af2fe5a105b288644367bbb6e0bc30d Author: Georgy Guminov <gogagum@gmail.com> Date: Sat Oct 26 14:48:51 2024 +0300 Correct static_assert messages. commit b5df827151a6d752168a59fa8c20c9ffd3766c0b Author: Georqy Guminov <gogagum@gmail.com> Date: Sun Jun 23 16:12:29 2024 +0300 Fixes. Remove some Boost.MPL usages. Remove unused includes. commit 01fd35e9f87d43f4bb46ed525a0e8eec46cba44a Author: Georgiy Guminov <gogagum@gmail.com> Date: Wed Jun 12 17:14:21 2024 +0300 abstract conjunction. commit c02def8acf68e0829082761d26955320974e5078 Author: Georgiy Guminov <gogagum@gmail.com> Date: Wed Jun 12 16:35:43 2024 +0300 return addressof & conjunction. commit 3b3d1625752cbe8c9ec62662e594a1af1fd9a458 Author: Georgiy Guminov <gogagum@gmail.com> Date: Wed Jun 12 16:30:44 2024 +0300 Make macro more readable. commit 4ab19e045fc535dc80228062d11bb6584ccd17ff Author: Georgiy Guminov <gogagum@gmail.com> Date: Wed Jun 12 15:56:49 2024 +0300 Add static_assert messages. commit 82b5c44cd34435d63af5cdbc7fcc1b07b39394de Author: Georgiy Guminov <gogagum@gmail.com> Date: Wed Jun 12 14:12:10 2024 +0300 Return is iterator CXX17 test. commit 2d58d65462e837430a0990c2a414d5c397e9fa31 Author: Georgiy Guminov <gogagum@gmail.com> Date: Tue Jun 11 14:04:17 2024 +0300 Omitted. commit a0d04d9491de818df990188436e04afc3ddba3ad Author: Georgiy Guminov <gogagum@gmail.com> Date: Tue Jun 11 14:00:35 2024 +0300 Replace move with static_cast commit 4a49b8a1a2d44d2da728dd064fe810ca86d8d1fd Author: Georgiy Guminov <gogagum@gmail.com> Date: Mon Jun 10 21:38:53 2024 +0300 Return BOOST_NOEXCEPT commit 054c013bba75c42710537a819de91d6abfe25658 Author: Georgiy Guminov <gogagum@gmail.com> Date: Sun Jun 9 15:20:41 2024 +0300 CXX11
231 lines
8.3 KiB
C++
231 lines
8.3 KiB
C++
// (C) Copyright David Abrahams 2002.
|
|
// 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 for most recent version including documentation.
|
|
|
|
// Revision History
|
|
// 04 Mar 2001 Patches for Intel C++ (Dave Abrahams)
|
|
// 19 Feb 2001 Take advantage of improved iterator_traits to do more tests
|
|
// on MSVC. Reordered some #ifdefs for coherency.
|
|
// (David Abrahams)
|
|
// 13 Feb 2001 Test new VC6 workarounds (David Abrahams)
|
|
// 11 Feb 2001 Final fixes for Borland (David Abrahams)
|
|
// 11 Feb 2001 Some fixes for Borland get it closer on that compiler
|
|
// (David Abrahams)
|
|
// 07 Feb 2001 More comprehensive testing; factored out static tests for
|
|
// better reuse (David Abrahams)
|
|
// 21 Jan 2001 Quick fix to my_iterator, which wasn't returning a
|
|
// reference type from operator* (David Abrahams)
|
|
// 19 Jan 2001 Initial version with iterator operators (David Abrahams)
|
|
|
|
#include <boost/operators.hpp>
|
|
#include <boost/config.hpp>
|
|
#include <iterator>
|
|
#include <vector>
|
|
#include <list>
|
|
#include <boost/core/lightweight_test.hpp>
|
|
#include <type_traits>
|
|
|
|
// A UDT for which we can specialize std::iterator_traits<element*> on
|
|
// compilers which don't support partial specialization. There's no
|
|
// other reasonable way to test pointers on those compilers.
|
|
struct element {};
|
|
|
|
// An iterator for which we can get traits.
|
|
struct my_iterator1
|
|
: boost::forward_iterator_helper<my_iterator1, char, long, const char*, const char&>
|
|
{
|
|
my_iterator1(const char* p) : m_p(p) {}
|
|
|
|
bool operator==(const my_iterator1& rhs) const
|
|
{ return this->m_p == rhs.m_p; }
|
|
|
|
my_iterator1& operator++() { ++this->m_p; return *this; }
|
|
const char& operator*() { return *m_p; }
|
|
private:
|
|
const char* m_p;
|
|
};
|
|
|
|
// Used to prove that we don't require std::iterator<> in the hierarchy under
|
|
// MSVC6, and that we can compute all the traits for a standard-conforming UDT
|
|
// iterator.
|
|
struct my_iterator2
|
|
: boost::equality_comparable<my_iterator2
|
|
, boost::incrementable<my_iterator2
|
|
, boost::dereferenceable<my_iterator2,const char*> > >
|
|
{
|
|
typedef char value_type;
|
|
typedef long difference_type;
|
|
typedef const char* pointer;
|
|
typedef const char& reference;
|
|
typedef std::forward_iterator_tag iterator_category;
|
|
|
|
my_iterator2(const char* p) : m_p(p) {}
|
|
|
|
bool operator==(const my_iterator2& rhs) const
|
|
{ return this->m_p == rhs.m_p; }
|
|
|
|
my_iterator2& operator++() { ++this->m_p; return *this; }
|
|
const char& operator*() { return *m_p; }
|
|
private:
|
|
const char* m_p;
|
|
};
|
|
|
|
// Used to prove that we're not overly confused by the existence of
|
|
// std::iterator<> in the hierarchy under MSVC6 - we should find that
|
|
// std::iterator_traits<my_iterator3>::difference_type is int.
|
|
struct my_iterator3 : my_iterator1
|
|
{
|
|
typedef int difference_type;
|
|
my_iterator3(const char* p)
|
|
: my_iterator1(p) {}
|
|
};
|
|
|
|
//
|
|
// Assertion tools. Used instead of BOOST_STATIC_ASSERT because that
|
|
// doesn't give us a nice stack backtrace
|
|
//
|
|
template <bool = false> struct assertion;
|
|
|
|
template <> struct assertion<true>
|
|
{
|
|
typedef char type;
|
|
};
|
|
|
|
template <class T, class U>
|
|
struct assert_same
|
|
: assertion<(std::is_same<T,U>::value)>
|
|
{
|
|
};
|
|
|
|
|
|
// Iterator tests
|
|
template <class Iterator,
|
|
class value_type, class difference_type, class pointer, class reference, class category>
|
|
struct non_portable_tests
|
|
{
|
|
typedef typename std::iterator_traits<Iterator>::pointer test_pt;
|
|
typedef typename std::iterator_traits<Iterator>::reference test_rt;
|
|
typedef typename assert_same<test_pt, pointer>::type a1;
|
|
typedef typename assert_same<test_rt, reference>::type a2;
|
|
};
|
|
|
|
template <class Iterator,
|
|
class value_type, class difference_type, class pointer, class reference, class category>
|
|
struct portable_tests
|
|
{
|
|
typedef typename std::iterator_traits<Iterator>::difference_type test_dt;
|
|
typedef typename std::iterator_traits<Iterator>::iterator_category test_cat;
|
|
typedef typename assert_same<test_dt, difference_type>::type a1;
|
|
typedef typename assert_same<test_cat, category>::type a2;
|
|
};
|
|
|
|
// Test iterator_traits
|
|
template <class Iterator,
|
|
class value_type, class difference_type, class pointer, class reference, class category>
|
|
struct input_iterator_test
|
|
: portable_tests<Iterator,value_type,difference_type,pointer,reference,category>
|
|
{
|
|
typedef typename std::iterator_traits<Iterator>::value_type test_vt;
|
|
typedef typename assert_same<test_vt, value_type>::type a1;
|
|
};
|
|
|
|
template <class Iterator,
|
|
class value_type, class difference_type, class pointer, class reference, class category>
|
|
struct non_pointer_test
|
|
: input_iterator_test<Iterator,value_type,difference_type,pointer,reference,category>
|
|
, non_portable_tests<Iterator,value_type,difference_type,pointer,reference,category>
|
|
{
|
|
};
|
|
|
|
template <class Iterator,
|
|
class value_type, class difference_type, class pointer, class reference, class category>
|
|
struct maybe_pointer_test
|
|
: portable_tests<Iterator,value_type,difference_type,pointer,reference,category>
|
|
, non_portable_tests<Iterator,value_type,difference_type,pointer,reference,category>
|
|
{
|
|
};
|
|
|
|
input_iterator_test<std::istream_iterator<int>, int, std::ptrdiff_t, int*, int&, std::input_iterator_tag>
|
|
istream_iterator_test;
|
|
|
|
// C++20 changed ostream_iterator::difference_type to ptrdiff_t.
|
|
// Note: gcc 10.1 defines __cplusplus to a value less than 202002L, but greater than 201703L in C++20 mode.
|
|
#if (__cplusplus > 201703L && ( \
|
|
(defined(BOOST_LIBSTDCXX_VERSION) && BOOST_LIBSTDCXX_VERSION >= 100100) || \
|
|
(defined(_LIBCPP_VERSION) && _LIBCPP_VERSION >= 12000) \
|
|
)) || \
|
|
(defined(_MSVC_LANG) && _MSVC_LANG > 201703L && _MSVC_STL_UPDATE >= 202010L)
|
|
#define BOOST_ITERATOR_CXX20_OSTREAM_ITERATOR
|
|
#endif
|
|
|
|
#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x564) && !defined(__SGI_STL_PORT)
|
|
typedef ::std::char_traits<char>::off_type distance;
|
|
non_pointer_test<std::ostream_iterator<int>,int,
|
|
distance,int*,int&,std::output_iterator_tag> ostream_iterator_test;
|
|
#elif defined(BOOST_MSVC_STD_ITERATOR)
|
|
non_pointer_test<std::ostream_iterator<int>,
|
|
int, void, int*, int&, std::output_iterator_tag>
|
|
ostream_iterator_test;
|
|
#elif BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(70190006))
|
|
non_pointer_test<std::ostream_iterator<int>,
|
|
int, long, int*, int&, std::output_iterator_tag>
|
|
ostream_iterator_test;
|
|
#elif defined(BOOST_ITERATOR_CXX20_OSTREAM_ITERATOR)
|
|
non_pointer_test<std::ostream_iterator<int>,
|
|
void, std::ptrdiff_t, void, void, std::output_iterator_tag>
|
|
ostream_iterator_test;
|
|
#else
|
|
non_pointer_test<std::ostream_iterator<int>,
|
|
void, void, void, void, std::output_iterator_tag>
|
|
ostream_iterator_test;
|
|
#endif
|
|
|
|
|
|
#ifdef __KCC
|
|
typedef long std_list_diff_type;
|
|
#else
|
|
typedef std::ptrdiff_t std_list_diff_type;
|
|
#endif
|
|
|
|
non_pointer_test<std::list<int>::iterator, int, std_list_diff_type, int*, int&, std::bidirectional_iterator_tag>
|
|
list_iterator_test;
|
|
|
|
maybe_pointer_test<std::vector<int>::iterator, int, std::ptrdiff_t, int*, int&, std::random_access_iterator_tag>
|
|
vector_iterator_test;
|
|
|
|
maybe_pointer_test<int*, int, std::ptrdiff_t, int*, int&, std::random_access_iterator_tag>
|
|
int_pointer_test;
|
|
|
|
non_pointer_test<my_iterator1, char, long, const char*, const char&, std::forward_iterator_tag>
|
|
my_iterator1_test;
|
|
|
|
non_pointer_test<my_iterator2, char, long, const char*, const char&, std::forward_iterator_tag>
|
|
my_iterator2_test;
|
|
|
|
non_pointer_test<my_iterator3, char, int, const char*, const char&, std::forward_iterator_tag>
|
|
my_iterator3_test;
|
|
|
|
int main()
|
|
{
|
|
char chars[100];
|
|
int ints[100];
|
|
|
|
for (int length = 3; length < 100; length += length / 3)
|
|
{
|
|
std::list<int> l(length);
|
|
BOOST_TEST(std::distance(l.begin(), l.end()) == length);
|
|
|
|
std::vector<int> v(length);
|
|
BOOST_TEST(std::distance(v.begin(), v.end()) == length);
|
|
|
|
BOOST_TEST(std::distance(&ints[0], ints + length) == length);
|
|
BOOST_TEST(std::distance(my_iterator1(chars), my_iterator1(chars + length)) == length);
|
|
BOOST_TEST(std::distance(my_iterator2(chars), my_iterator2(chars + length)) == length);
|
|
BOOST_TEST(std::distance(my_iterator3(chars), my_iterator3(chars + length)) == length);
|
|
}
|
|
return boost::report_errors();
|
|
}
|