1.36.0 beta 1

[SVN r47919]

CMakeLists.txt

@@ -1,30 +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
-    enable_shared_from_this.hpp
-    pointer_cast.hpp
-    scoped_array.hpp
-    scoped_ptr.hpp
-    shared_array.hpp
-    shared_ptr.hpp
-    weak_ptr.hpp
-)
-
-# Add a library target to the build system
-boost_library_project(
-  smart_ptr
-  #  SRCDIRS 
-  TESTDIRS  test
-  HEADERS ${lib_headers}
-  #  DOCDIRS 
-  DESCRIPTION  "Five smart pointer class templates."
-  MODULARIZED 
-  AUTHORS  "Greg Colvin"
-           "Beman Dawes <bdawes -at- acm.org>"
-           "Peter Dimov <pdimov -at- mmltd.net>"
-           "Darin Adler"
-  #  MAINTAINERS 
-)
-
-

include/boost/detail/atomic_count.hpp

@@ -90,18 +90,23 @@ typedef long atomic_count;
 }
 
 #elif defined(BOOST_AC_USE_PTHREADS)
+
 #  include <boost/detail/atomic_count_pthreads.hpp>
 
 #elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) )
+
 # include <boost/detail/atomic_count_gcc_x86.hpp>
 
 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+
 #  include <boost/detail/atomic_count_win32.hpp>
 
-#elif defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __hppa ) && ( !defined( __INTEL_COMPILER ) || defined( __ia64__ ) )
+#elif defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 )
+
 #  include <boost/detail/atomic_count_sync.hpp>
 
 #elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
+
 #  include <boost/detail/atomic_count_gcc.hpp>
 
 #elif defined(BOOST_HAS_PTHREADS)

include/boost/detail/atomic_count_sync.hpp

@@ -15,10 +15,6 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#if defined( __ia64__ ) && defined( __INTEL_COMPILER )
-# include <ia64intrin.h>
-#endif
-
 namespace boost
 {
 

include/boost/detail/sp_convertible.hpp

@@ -25,7 +25,7 @@
 # define BOOST_SP_NO_SP_CONVERTIBLE
 #endif
 
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && defined( __BORLANDC__ ) && ( __BORLANDC__ <= 0x610 )
+#if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && defined( __BORLANDC__ ) && ( __BORLANDC__ < 0x600 )
 # define BOOST_SP_NO_SP_CONVERTIBLE
 #endif
 

include/boost/detail/sp_counted_base.hpp

@@ -46,10 +46,10 @@
 #elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) )
 # include <boost/detail/sp_counted_base_gcc_ppc.hpp>
 
-#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __hppa ) && ( !defined( __INTEL_COMPILER ) || defined( __ia64__ ) )
+#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __hppa )
 # include <boost/detail/sp_counted_base_sync.hpp>
 
-#elif defined(__GNUC__) && ( defined( __sparcv9 ) || ( defined( __sparcv8 ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 ) ) )
+#elif defined(__GNUC__) && ( defined( __sparcv8 ) || defined( __sparcv9 ) )
 # include <boost/detail/sp_counted_base_gcc_sparc.hpp>
 
 #elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )

include/boost/detail/spinlock.hpp

@@ -30,9 +30,9 @@
 
 #include <boost/config.hpp>
 
-#if defined(__GNUC__) && defined( __arm__ ) && !defined( __thumb__ )
+#if defined(__GNUC__) && defined( __arm__ )
 #  include <boost/detail/spinlock_gcc_arm.hpp>
-#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __hppa ) && ( !defined( __INTEL_COMPILER ) || defined( __ia64__ ) )
+#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 )
 #  include <boost/detail/spinlock_sync.hpp>
 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 #  include <boost/detail/spinlock_w32.hpp>

module.cmake

@@ -1 +0,0 @@
-boost_module(smart_ptr DEPENDS utility)

shared_array.htm

@@ -47,7 +47,7 @@
       void <a href="#reset">reset</a>(T * p = 0);
       template&lt;class D&gt; void <a href="#reset">reset</a>(T * p, D d);
 
-      T &amp; <a href="#indexing">operator[]</a>(std::ptrdiff_t i) const; // never throws
+      T &amp; <a href="#indexing">operator[]</a>(std::ptrdiff_t i) const() const; // never throws
       T * <a href="#get">get</a>() const; // never throws
 
       bool <a href="#unique">unique</a>() const; // never throws

src/sp_collector.cpp

@@ -104,8 +104,6 @@ static void find_unreachable_objects_impl(map_type const & m, map2_type & m2)
 
             BOOST_ASSERT(p->use_count() != 0); // there should be no inactive counts in the map
 
-            m2[ i->first ];
-
             scan_and_count(i->second.first, i->second.second, m, m2);
         }
 
@@ -123,7 +121,7 @@ static void find_unreachable_objects_impl(map_type const & m, map2_type & m2)
             if(p->use_count() != i->second) open.push_back(p);
         }
 
-        std::cout << "... " << open.size() << " objects in open.\n";
+        std::cout << "... " << m2.size() << " objects in open.\n";
 
         for(open_type::iterator j = open.begin(); j != open.end(); ++j)
         {

test/CMakeLists.txt

@@ -1,18 +0,0 @@
-boost_additional_test_dependencies(tokenizer BOOST_DEPENDS test intrusive)
-
-
-boost_test_run(smart_ptr_test)
-boost_test_run(shared_ptr_basic_test)
-boost_test_run(shared_ptr_test)
-boost_test_run(weak_ptr_test)
-boost_test_run(shared_from_this_test)
-boost_test_run(get_deleter_test)
-boost_test_run(intrusive_ptr_test)
-boost_test_run(atomic_count_test)
-boost_test_run(lw_mutex_test)
-boost_test_compile_fail(shared_ptr_assign_fail)
-boost_test_compile_fail(shared_ptr_delete_fail)
-boost_test_run(shared_ptr_alloc2_test)
-boost_test_run(pointer_cast_test)
-boost_test_compile(pointer_to_other_test)
-boost_test_run(auto_ptr_rv_test)