Branch at revision 46530

[SVN r46531]

CMakeLists.txt

@@ -1,24 +0,0 @@
-#----------------------------------------------------------------------------
-# This file was automatically generated from the original CMakeLists.txt file
-# Add a variable to hold the headers for the library
-set (lib_headers
-    iterator.hpp
-    iterator
-)
-
-# Add a library target to the build system
-boost_library_project(
-  iterator
-  #  SRCDIRS 
-  TESTDIRS  test
-  HEADERS ${lib_headers}
-  #  DOCDIRS 
-  DESCRIPTION  "A system of concepts which extend the C++ standard iterator requirementsand a framework of components for building iterators based on these extended concepts and includes several useful iterator adaptors."
-  MODULARIZED 
-  AUTHORS  "David Abrahams <dave -at- boostpro.com>"
-           "Jeremy Siek <jeremy.siek -at- gmail.com>"
-           "Thomas Witt <witt - at - acm.org>"
-  #  MAINTAINERS 
-)
-
-

include/boost/iterator/detail/config_def.hpp

@@ -47,7 +47,7 @@
 #endif
 
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)                                       \
-    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x5A0))                   \
+    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x531))                   \
     || (BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 700) && defined(_MSC_VER)) \
     || BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042))                \
     || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))

include/boost/iterator/indirect_iterator.hpp

@@ -110,7 +110,7 @@ namespace boost
   private:    
       typename super_t::reference dereference() const
       {
-# if BOOST_WORKAROUND(__BORLANDC__, < 0x5A0 )
+# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
           return const_cast<super_t::reference>(**this->base());
 # else
           return **this->base();

include/boost/iterator/iterator_adaptor.hpp

@@ -24,14 +24,9 @@
 
 #ifdef BOOST_ITERATOR_REF_CONSTNESS_KILLS_WRITABILITY
 # include <boost/type_traits/remove_reference.hpp>
-
-# if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
-#   include <boost/type_traits/add_reference.hpp>
-# endif
-
-#else
+#else 
 # include <boost/type_traits/add_reference.hpp>
-#endif
+#endif 
 
 #include <boost/iterator/detail/config_def.hpp>
 

include/boost/iterator/iterator_facade.hpp

@@ -470,7 +470,8 @@ namespace boost
   //
   class iterator_core_access
   {
-# if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)                  
+# if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)                  \
+    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
       // Tasteless as this may seem, making all members public allows member templates
       // to work in the absence of member template friends.
    public:

module.cmake

@@ -1 +0,0 @@
-boost_module(iterator DEPENDS config mpl type_traits function)

test/CMakeLists.txt

@@ -1,31 +0,0 @@
-# These first two tests will run last, and are expected to fail
-# for many less-capable compilers.
-
-boost_test_compile_fail(interoperable_fail)
-# test uses expected success, so that we catch unrelated
-# compilation problems.
-boost_test_run(is_convertible_fail)  
-boost_test_run(zip_iterator_test)
-  
-# These tests should work for just about everything.
-boost_test_compile(is_lvalue_iterator)
-boost_test_compile(is_readable_iterator)
-boost_test_compile(pointee)
-  
-boost_test_run(unit_tests)
-boost_test_run(concept_tests)
-boost_test_run(iterator_adaptor_cc)
-boost_test_run(iterator_adaptor_test)
-boost_test_compile(iterator_archetype_cc)
-boost_test_compile_fail(iter_archetype_default_ctor)
-boost_test_compile_fail(lvalue_concept_fail)
-boost_test_run(transform_iterator_test)
-boost_test_run(indirect_iterator_test)
-boost_test_compile(indirect_iter_member_types)
-boost_test_run(filter_iterator_test)
-boost_test_run(iterator_facade)
-boost_test_run(reverse_iterator_test)
-boost_test_run(counting_iterator_test)
-boost_test_run(interoperable)
-boost_test_run(iterator_traits_test)
-boost_test_run(permutation_iterator_test)