Release 1.49.0

[SVN r77094]
[boost][range] - merge from trunk of miscellaneous defect fixes
2012-02-22 22:08:43 +00:00 · 2011-06-05 21:47:57 +00:00 · 2011-05-27 19:51:13 +00:00 · 2011-01-16 17:07:27 +00:00 · 2011-01-10 06:35:02 +00:00 · 2010-12-26 15:13:43 +00:00
9 changed files with 68 additions and 68 deletions
--- a/include/boost/range.hpp
+++ b/include/boost/range.hpp
@ -15,7 +15,7 @@
 # pragma once
 #endif

-#if defined(_MSC_VER) && (_MSC_VER == 1300)
+#if _MSC_VER == 1300 // experiment

 #include <boost/range/detail/collection_traits.hpp>
 #include <boost/range/iterator_range.hpp>
@ -28,6 +28,6 @@
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/sub_range.hpp>

-#endif // _MSC_VER == 1300
+#endif // _MSC_VER == 1300 // experiment

 #endif
--- a/include/boost/range/as_literal.hpp
+++ b/include/boost/range/as_literal.hpp
@ -25,7 +25,7 @@
 #include <boost/detail/workaround.hpp>

 #include <cstring>
-#ifndef BOOST_NO_CWCHAR 
+#ifndef BOOST_NO_CWCHAR
 #include <cwchar>
 #endif

@ -38,41 +38,41 @@ namespace boost
            return strlen( s );
        }

-#ifndef BOOST_NO_CWCHAR  
+#ifndef BOOST_NO_CWCHAR
        inline std::size_t length( const wchar_t* s )
        {
            return wcslen( s );
        }
-#endif        
+#endif

        //
        // Remark: the compiler cannot choose between T* and T[sz]
        // overloads, so we must put the T* internal to the
        // unconstrained version.
-        // 
+        //

        inline bool is_char_ptr( char* )
        {
            return true;
        }
-        
+
        inline bool is_char_ptr( const char* )
        {
            return true;
        }

-#ifndef BOOST_NO_CWCHAR  
+#ifndef BOOST_NO_CWCHAR
        inline bool is_char_ptr( wchar_t* )
        {
            return true;
        }
-        
+
        inline bool is_char_ptr( const wchar_t* )
        {
            return true;
        }
 #endif
-        
+
        template< class T >
        inline long is_char_ptr( T /* r */ )
        {
@ -80,30 +80,30 @@ namespace boost
        }

        template< class T >
-        inline iterator_range<T*> 
+        inline iterator_range<T*>
        make_range( T* const r, bool )
        {
            return iterator_range<T*>( r, r + length(r) );
        }

        template< class T >
-        inline iterator_range<BOOST_DEDUCED_TYPENAME range_iterator<T>::type> 
+        inline iterator_range<BOOST_DEDUCED_TYPENAME range_iterator<T>::type>
        make_range( T& r, long )
        {
            return boost::make_iterator_range( r );
        }

    }
-    
+
    template< class Range >
-    inline iterator_range<BOOST_DEDUCED_TYPENAME range_iterator<Range>::type> 
+    inline iterator_range<BOOST_DEDUCED_TYPENAME range_iterator<Range>::type>
    as_literal( Range& r )
    {
        return range_detail::make_range( r, range_detail::is_char_ptr(r) );
    }

    template< class Range >
-    inline iterator_range<BOOST_DEDUCED_TYPENAME range_iterator<const Range>::type> 
+    inline iterator_range<BOOST_DEDUCED_TYPENAME range_iterator<const Range>::type>
    as_literal( const Range& r )
    {
        return range_detail::make_range( r, range_detail::is_char_ptr(r) );
@ -112,9 +112,9 @@ namespace boost
    template< class Char, std::size_t sz >
    inline iterator_range<Char*> as_literal( Char (&arr)[sz] )
    {
-        return range_detail::make_range( arr, range_detail::is_char_ptr(arr) );        
+        return range_detail::make_range( arr, range_detail::is_char_ptr(arr) );
    }
-    
+
    template< class Char, std::size_t sz >
    inline iterator_range<const Char*> as_literal( const Char (&arr)[sz] )
    {
--- a/include/boost/range/detail/implementation_help.hpp
+++ b/include/boost/range/detail/implementation_help.hpp
@ -21,13 +21,13 @@
 #include <wchar.h>
 #endif

-namespace boost 
+namespace boost
 {
    namespace range_detail
    {
        template <typename T>
        inline void boost_range_silence_warning( const T& ) { }
-        
+
        /////////////////////////////////////////////////////////////////////
        // end() help
        /////////////////////////////////////////////////////////////////////
@ -36,7 +36,7 @@ namespace boost
        {
            return s + strlen( s );
        }
-        
+
 #ifndef BOOST_NO_CWCHAR
        inline const wchar_t* str_end( const wchar_t* s, const wchar_t* )
        {
@ -51,7 +51,7 @@ namespace boost
                ;
            return s;
        }
-#endif         
+#endif

        template< class Char >
        inline Char* str_end( Char* s )
@ -64,7 +64,7 @@ namespace boost
        {
            return boost_range_array + sz;
        }
-        
+
        template< class T, std::size_t sz >
        inline const T* array_end( const T BOOST_RANGE_ARRAY_REF()[sz] )
        {
@ -74,7 +74,7 @@ namespace boost
        /////////////////////////////////////////////////////////////////////
        // size() help
        /////////////////////////////////////////////////////////////////////
-        
+
        template< class Char >
        inline std::size_t str_size( const Char* const& s )
        {
@ -96,7 +96,7 @@ namespace boost
        }

    } // namespace 'range_detail'
-    
+
 } // namespace 'boost'


--- a/include/boost/range/iterator.hpp
+++ b/include/boost/range/iterator.hpp
@ -25,46 +25,46 @@
 namespace boost
 {

-#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)  
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)

-    namespace range_detail_vc7_1  
-    {  
-       template< typename C, typename Sig = void(C) >  
-       struct range_iterator  
-       {  
-           typedef BOOST_RANGE_DEDUCED_TYPENAME   
-               mpl::eval_if_c< is_const<C>::value,   
-                               range_const_iterator< typename remove_const<C>::type >,  
-                               range_mutable_iterator<C> >::type type;  
-       };  
-    
-       template< typename C, typename T >  
-       struct range_iterator< C, void(T[]) >  
-       {  
-           typedef T* type;  
-       };       
-    }  
-    
-#endif  
+    namespace range_detail_vc7_1
+    {
+       template< typename C, typename Sig = void(C) >
+       struct range_iterator
+       {
+           typedef BOOST_RANGE_DEDUCED_TYPENAME
+               mpl::eval_if_c< is_const<C>::value,
+                               range_const_iterator< typename remove_const<C>::type >,
+                               range_mutable_iterator<C> >::type type;
+       };
+
+       template< typename C, typename T >
+       struct range_iterator< C, void(T[]) >
+       {
+           typedef T* type;
+       };
+    }
+
+#endif

    template< typename C >
    struct range_iterator
    {
 #if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
-  
-        typedef BOOST_RANGE_DEDUCED_TYPENAME  
-               range_detail_vc7_1::range_iterator<C>::type type;  
-           
-#else  

-        typedef BOOST_RANGE_DEDUCED_TYPENAME 
-            mpl::eval_if_c< is_const<C>::value, 
+        typedef BOOST_RANGE_DEDUCED_TYPENAME
+               range_detail_vc7_1::range_iterator<C>::type type;
+
+#else
+
+        typedef BOOST_RANGE_DEDUCED_TYPENAME
+            mpl::eval_if_c< is_const<C>::value,
                            range_const_iterator< typename remove_const<C>::type >,
                            range_mutable_iterator<C> >::type type;
-        
-#endif         
+
+#endif
    };
-    
+
 } // namespace boost

 //#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
--- a/test/adl_conformance.cpp
+++ b/test/adl_conformance.cpp
@ -172,9 +172,9 @@ void check_adl_conformance()
    BOOST_CHECK_EQUAL( boost_test::begin( r6 ), global_namespace );
 }

-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/included/unit_test_framework.hpp>

-using boost::unit_test::test_suite;
+using boost::unit_test_framework::test_suite;

 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {
--- a/test/begin.cpp
+++ b/test/begin.cpp
@ -18,7 +18,7 @@
 #include <boost/range/begin.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/included/unit_test_framework.hpp>

 namespace mock_std
 {
@ -104,12 +104,12 @@ namespace
    }
 }

-using boost::unit_test::test_suite;
+using boost::unit_test_framework::test_suite;

-boost::unit_test::test_suite*
+boost::unit_test_framework::test_suite*
 init_unit_test_suite( int argc, char* argv[] )
 {
-    boost::unit_test::test_suite* test = BOOST_TEST_SUITE( "Range Test Suite - begin() ADL namespace barrier" );
+    boost::unit_test_framework::test_suite* test = BOOST_TEST_SUITE( "Range Test Suite - begin() ADL namespace barrier" );

    test->add( BOOST_TEST_CASE( &test_range_begin ) );

--- a/test/compat2.cpp
+++ b/test/compat2.cpp
@ -53,9 +53,9 @@ void compat1()
    iterator_of< std::vector<int> >::type i = v.begin();
 }

-#include <boost/test/included/unit_test.hpp> 
+#include <boost/test/included/unit_test_framework.hpp> 

-using boost::unit_test::test_suite;
+using boost::unit_test_framework::test_suite;

 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {
--- a/test/compat3.cpp
+++ b/test/compat3.cpp
@ -53,9 +53,9 @@ void compat1()
    iterator_of< std::vector<int> >::type i = v.begin();
 }

-#include <boost/test/included/unit_test.hpp> 
+#include <boost/test/included/unit_test_framework.hpp> 

-using boost::unit_test::test_suite;
+using boost::unit_test_framework::test_suite;

 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {
--- a/test/end.cpp
+++ b/test/end.cpp
@ -18,7 +18,7 @@
 #include <boost/range/end.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/included/unit_test_framework.hpp>

 namespace mock_std
 {
@ -104,12 +104,12 @@ namespace
    }
 }

-using boost::unit_test::test_suite;
+using boost::unit_test_framework::test_suite;

-boost::unit_test::test_suite*
+boost::unit_test_framework::test_suite*
 init_unit_test_suite( int argc, char* argv[] )
 {
-    boost::unit_test::test_suite* test = BOOST_TEST_SUITE( "Range Test Suite - end() ADL namespace barrier" );
+    boost::unit_test_framework::test_suite* test = BOOST_TEST_SUITE( "Range Test Suite - end() ADL namespace barrier" );

    test->add( BOOST_TEST_CASE( &test_range_end_adl_avoidance ) );
Author	SHA1	Message	Date
Beman Dawes	5c3a15d747	Release 1.49.0 [SVN r77094]	2012-02-22 22:08:43 +00:00
Neil Groves	2f3d82be9f	[boost][range] - merge from trunk of miscellaneous defect fixes [SVN r72427]	2011-06-05 21:47:57 +00:00
Bryce Adelstein-Lelbach	47e478d099	Merge to release. [SVN r72228]	2011-05-27 19:51:13 +00:00
Neil Groves	cafea6aea5	[boost][range] - Merge a fix to undo an erroneous change to iterator_range.size() that allowed it to compile for ranges that did not model the Random Access Range Concept and thereby broken the complexity guarantees. [SVN r68190]	2011-01-16 17:07:27 +00:00
Neil Groves	6d46ce412f	[range] - merge the tested changes from the trunk in preparation for the 1.46 release. [SVN r67905]	2011-01-10 06:35:02 +00:00
Neil Groves	674be9dfa0	[boost][range] - merge from trunk which fixes a defect in the strided range adaptor, and contains improvements to the documentation [SVN r67454]	2010-12-26 15:13:43 +00:00
Daniel James	65b22bfa38	Merge filesystem, range, doc from trunk. * Inline deprecated methods in filesystem. * Fix some links in range. * Clean up test document a bit. [SVN r64315]	2010-07-24 14:26:01 +00:00
Daniel James	fb8994f51c	Merge documentation changes. [SVN r64186]	2010-07-19 23:29:09 +00:00
Neil Groves	26c095d022	Boost.Range merge of bug fixes and documentation [SVN r64120]	2010-07-18 11:36:34 +00:00
Daniel James	ca2328ed87	Merge documentation fixes. * Use `doc/src/.css` instead of `doc/html/.css`. * Remove wiki and people directories. * Some documentation fixes. * Left out `minimal.css` changes and boostbook changes because of clashes. [SVN r63347]	2010-06-26 12:30:09 +00:00
Douglas Gregor	794fd3e226	Move Boost.Range's join_iterator intrusive_ptr_add_ref and intrusive_ptr_release where ADL will actually find them [SVN r61867]	2010-05-09 01:32:55 +00:00
Douglas Gregor	88001ada37	Merge standards-conformance fixes for Boost.Range [SVN r61864]	2010-05-09 01:23:32 +00:00
Neil Groves	91d62c2c1a	Boost.Range documentation merge from the trunk. Corrects inconsitency with return types, Range Return Categories etc. [SVN r61685]	2010-04-29 21:18:58 +00:00
Neil Groves	f9eeb5d447	Boost.Range correct missing items from merge by merging these changes manually. This changeset is what should have happened with the prior svn merge operation. [SVN r61519]	2010-04-23 23:18:59 +00:00
Neil Groves	a47f15a98f	Boost.Range merge from trunk to release. This is motivated by the need to correct the istream_range, to correct the adaptors.hpp header file, and correct the return types of various range algorithms. [SVN r61517]	2010-04-23 22:50:56 +00:00
Neil Groves	dfc30e334d	Boost.Range merged defect fix for iterator_range. [SVN r61280]	2010-04-14 21:15:41 +00:00
Neil Groves	13b748a228	Boost.Range removed deprecated html documentation. [SVN r61181]	2010-04-10 15:25:56 +00:00
Neil Groves	eea32403ef	Boost.Range merge of fixes from the trunk. [SVN r61146]	2010-04-08 19:34:17 +00:00
Neil Groves	29b2053f5c	Merged the new Boost.Range into the release branch. [SVN r61052]	2010-04-04 20:00:13 +00:00
Troy D. Straszheim	29fa877949	rm cmake from the release branch before it goes out broken. Policy dictates that you never commit to release, you commit to trunk and merge to release. [SVN r56941]	2009-10-17 01:10:45 +00:00
Troy D. Straszheim	a39946c55d	Add basic copyright/license to keep cmake out of the inspection report [SVN r55095]	2009-07-22 21:51:01 +00:00
Daniel James	90f4eca5cd	Merge in inspect checks for links in CSS files and external content. And fix a few of these issues. Merged revisions 52663-52664,52666-52668,52712 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r52663 \| danieljames \| 2009-04-29 22:12:08 +0100 (Wed, 29 Apr 2009) \| 1 line Check for invalid css links in html files as well as css files. ........ r52664 \| danieljames \| 2009-04-29 22:12:32 +0100 (Wed, 29 Apr 2009) \| 1 line Check for external links. ........ r52666 \| danieljames \| 2009-04-29 22:19:12 +0100 (Wed, 29 Apr 2009) \| 1 line Use local copies of the boost logo. ........ r52667 \| danieljames \| 2009-04-29 22:19:40 +0100 (Wed, 29 Apr 2009) \| 1 line Remove unused copy of boostbook.css ........ r52668 \| danieljames \| 2009-04-29 22:19:56 +0100 (Wed, 29 Apr 2009) \| 3 lines Fix a link to a header on trac. IMO it would be better to link to the local copy. ........ r52712 \| danieljames \| 2009-05-01 21:51:10 +0100 (Fri, 01 May 2009) \| 1 line Better inspect error for external content. ........ [SVN r53044]	2009-05-16 13:45:21 +00:00
Thorsten Jørgen Ottosen	c8c808b04e	fix for bug Ticket #2903 [SVN r52204]	2009-04-05 20:49:47 +00:00
John Maddock	deefb61ec6	Merge PDF build changes from Trunk. [SVN r51417]	2009-02-23 18:39:32 +00:00
Troy D. Straszheim	12d904a5e4	merge of cmake build files from trunk per beman [SVN r50756]	2009-01-24 18:57:20 +00:00
Thorsten Jørgen Ottosen	26b096f65d	update in response to inspection report [SVN r47681]	2008-07-22 09:29:56 +00:00
Thorsten Jørgen Ottosen	a85afbe470	doc update [SVN r47495]	2008-07-16 21:05:16 +00:00
Thorsten Jørgen Ottosen	e7902d439b	more changes from trunk [SVN r46652]	2008-06-24 15:42:48 +00:00
Thorsten Jørgen Ottosen	b4f99d66b5	bug-fixes from trunk [SVN r46649]	2008-06-24 15:38:50 +00:00
Thorsten Jørgen Ottosen	d1c2c5ce3f	bug-fixes from trunk [SVN r46647]	2008-06-24 15:37:59 +00:00
Thorsten Jørgen Ottosen	062e820882	cleanup to pass inspection tool [SVN r43139]	2008-02-07 08:38:07 +00:00
Thorsten Jørgen Ottosen	4d381e8564	fixed #if -> #ifdef [SVN r42716]	2008-01-13 11:38:13 +00:00
Thorsten Jørgen Ottosen	fd00cc129f	doc fixes [SVN r42692]	2008-01-12 12:38:46 +00:00
Thorsten Jørgen Ottosen	8291ce67fc	minor changes from trunk [SVN r41751]	2007-12-05 17:30:23 +00:00
Thorsten Jørgen Ottosen	dbfa1df088	missing include (Ticket #1463 ) [SVN r41637]	2007-12-03 09:01:03 +00:00
Thorsten Jørgen Ottosen	5afec2b74f	merge from truck (boost::size()->boost::distance()) [SVN r41635]	2007-12-03 08:51:22 +00:00
Beman Dawes	a33d5c22c5	Full merge from trunk at revision 41356 of entire boost-root tree. [SVN r41370]	2007-11-25 18:38:02 +00:00
Beman Dawes	901266b76a	Full merge from trunk at revision 41356 of entire boost-root tree. [SVN r41369]	2007-11-25 18:07:19 +00:00
Beman Dawes	25e932149c	Starting point for releases [SVN r39706]	2007-10-05 14:25:06 +00:00
nobody	c54e15d374	This commit was manufactured by cvs2svn to create tag 'Version_1_34_1'. [SVN r38286]	2007-07-24 19:28:14 +00:00
Thorsten Jørgen Ottosen	fd448ffa31	removed invalid test [SVN r37117]	2007-02-28 22:27:50 +00:00
Thorsten Jørgen Ottosen	21b558fe5e	license info [SVN r36156]	2006-11-22 22:33:09 +00:00
Thorsten Jørgen Ottosen	33c8f3e3ec	* empty log message * [SVN r36155]	2006-11-22 22:27:28 +00:00
Vladimir Prus	523f8a5926	Merge from HEAD. Allow building of shared versions of some Boost.Test libraries. Adjust tests to use always use static linking to Boost.Test, since linking to the shared version requires test changes. Patch from Juergen Hunold. [SVN r35990]	2006-11-10 19:59:52 +00:00
Rene Rivera	3bd0d886c4	Remove obsolete Boost.Build v1 files. [SVN r35880]	2006-11-06 17:10:46 +00:00
Thorsten Jørgen Ottosen	e46eae8144	* empty log message * [SVN r35717]	2006-10-24 10:37:46 +00:00
Daniel James	12cf02586c	Remove tabs [SVN r34957]	2006-08-26 14:28:38 +00:00
Thorsten Jørgen Ottosen	ee024f588b	applied borland patch [SVN r33670]	2006-04-11 20:12:31 +00:00
nobody	8e715b3810	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r33417]	2006-03-21 02:26:31 +00:00