Subject: [Boost-commit] svn:boost r85321 - in branches/release: . libs libs/math libs/math/dot_net_example/distribution_explorer/Properties libs/ptr_container/test tools tools/regression tools/regression/test/test-cases/general
From: jhunold_at_[hidden]
Date: 2013-08-12 10:56:38
Author: jhunold
Date: 2013-08-12 10:56:38 EDT (Mon, 12 Aug 2013)
New Revision: 85321
URL: http://svn.boost.org/trac/boost/changeset/85321
Log:
Merge 85234,85235,85236,85237 from ^/trunk
------------------------------------------------------------------------
r85234 | jhunold | 2013-08-07 14:28:00 +0200 (Mi, 07 Aug 2013) | 1 line
Add missing svn:eol-style to be consistent with the other xml files. Needed for smooth git transition
------------------------------------------------------------------------
r85235 | jhunold | 2013-08-07 14:46:11 +0200 (Mi, 07 Aug 2013) | 1 line
Add missing svn:eol-style native. Fixes mixed line endings. Needed for smooth git transition.
------------------------------------------------------------------------
r85236 | jhunold | 2013-08-07 14:50:32 +0200 (Mi, 07 Aug 2013) | 1 line
Add missing svn:eol-style native. Fixes line ending issues discovered by git transition.
------------------------------------------------------------------------
r85237 | jhunold | 2013-08-07 14:52:10 +0200 (Mi, 07 Aug 2013) | 1 line
Add missing svn:eol-style native and mime-type. Fixes line ending issues discovered by git transition.
------------------------------------------------------------------------
Properties modified:
branches/release/ (props changed)
branches/release/libs/ (props changed)
branches/release/libs/math/ (props changed)
branches/release/libs/math/dot_net_example/distribution_explorer/Properties/app.manifest (contents, props changed)
branches/release/libs/ptr_container/test/ptr_inserter.cpp (contents, props changed)
branches/release/tools/ (props changed)
branches/release/tools/regression/ (props changed)
branches/release/tools/regression/test/test-cases/general/bjam.log (contents, props changed)
Text files modified:
branches/release/libs/math/dot_net_example/distribution_explorer/Properties/app.manifest | 20 ++--
branches/release/libs/ptr_container/test/ptr_inserter.cpp | 186 ++++++++++++++++++++--------------------
branches/release/tools/regression/test/test-cases/general/bjam.log | 6
3 files changed, 106 insertions(+), 106 deletions(-)
Modified: branches/release/libs/math/dot_net_example/distribution_explorer/Properties/app.manifest
==============================================================================
--- branches/release/libs/math/dot_net_example/distribution_explorer/Properties/app.manifest Mon Aug 12 09:40:52 2013 (r85320)
+++ branches/release/libs/math/dot_net_example/distribution_explorer/Properties/app.manifest 2013-08-12 10:56:38 EDT (Mon, 12 Aug 2013) (r85321)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
- <security>
- <applicationRequestMinimum>
- <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
- <defaultAssemblyRequest permissionSetReference="Custom" />
- </applicationRequestMinimum>
- </security>
- </trustInfo>
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <applicationRequestMinimum>
+ <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
+ <defaultAssemblyRequest permissionSetReference="Custom" />
+ </applicationRequestMinimum>
+ </security>
+ </trustInfo>
</asmv1:assembly>
\ No newline at end of file
Modified: branches/release/libs/ptr_container/test/ptr_inserter.cpp
==============================================================================
--- branches/release/libs/ptr_container/test/ptr_inserter.cpp Mon Aug 12 09:40:52 2013 (r85320)
+++ branches/release/libs/ptr_container/test/ptr_inserter.cpp 2013-08-12 10:56:38 EDT (Mon, 12 Aug 2013) (r85321)
@@ -1,93 +1,93 @@
-//
-// Boost.Pointer Container
-//
-// Copyright Thorsten Ottosen 2008. Use, modification and
-// distribution is subject to 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)
-//
-// For more information, see http://www.boost.org/libs/ptr_container/
-//
-
-#include <boost/ptr_container/ptr_inserter.hpp>
-#include <boost/ptr_container/indirect_fun.hpp>
-#include <boost/ptr_container/ptr_deque.hpp>
-#include <boost/ptr_container/ptr_list.hpp>
-#include <boost/assign/list_inserter.hpp>
-#include <boost/iterator/transform_iterator.hpp>
-#include <boost/test/test_tools.hpp>
-#include <algorithm>
-#include <functional>
-#include <string>
-
-template< class T >
-struct caster_to
-{
- typedef T result_type;
-
- T operator()( void* obj ) const
- {
- return static_cast<T>( obj );
- }
-};
-
-template< class PtrSequence >
-void test_ptr_inserter_helper()
-{
- using namespace boost;
- PtrSequence seq;
- const int size = 1000;
- for( int i = 0; i != size; ++i )
- seq.push_back( i % 3 == 0 ? 0 : new int(i) );
-
- PtrSequence seq2;
- //
- // @remark: we call .base() to avoid null pointer indirection.
- // The clone_inserter will handle the nulls correctly.
- //
- std::copy( boost::make_transform_iterator( seq.begin().base(), caster_to<int*>() ),
- boost::make_transform_iterator( seq.end().base(), caster_to<int*>() ),
- ptr_container::ptr_back_inserter( seq2 ) );
-
- std::copy( boost::make_transform_iterator( seq.begin().base(), caster_to<int*>() ),
- boost::make_transform_iterator( seq.end().base(), caster_to<int*>() ),
- ptr_container::ptr_front_inserter( seq2 ) );
- BOOST_CHECK_EQUAL( seq.size()*2, seq2.size() );
-
- PtrSequence seq3;
- for( int i = 0; i != size; ++i )
- seq3.push_back( new int(i%3) );
-
- //
- // @remark: since there are no nulls in this container, it
- // is easier to handle.
- //
- std::copy( seq3.begin(), seq3.end(),
- ptr_container::ptr_inserter( seq, seq.end() ) );
- BOOST_CHECK_EQUAL( seq.size(), seq2.size() );
-}
-
-
-void test_ptr_inserter()
-{
- test_ptr_inserter_helper< boost::ptr_list< boost::nullable<int> > >();
- test_ptr_inserter_helper< boost::ptr_deque< boost::nullable<int> > >();
-
-
-}
-
-
-
-#include <boost/test/unit_test.hpp>
-using boost::unit_test::test_suite;
-
-test_suite* init_unit_test_suite( int argc, char* argv[] )
-{
- test_suite* test = BOOST_TEST_SUITE( "Pointer Container Test Suite" );
-
- test->add( BOOST_TEST_CASE( &test_ptr_inserter ) );
-
- return test;
-}
-
-
+//
+// Boost.Pointer Container
+//
+// Copyright Thorsten Ottosen 2008. Use, modification and
+// distribution is subject to 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)
+//
+// For more information, see http://www.boost.org/libs/ptr_container/
+//
+
+#include <boost/ptr_container/ptr_inserter.hpp>
+#include <boost/ptr_container/indirect_fun.hpp>
+#include <boost/ptr_container/ptr_deque.hpp>
+#include <boost/ptr_container/ptr_list.hpp>
+#include <boost/assign/list_inserter.hpp>
+#include <boost/iterator/transform_iterator.hpp>
+#include <boost/test/test_tools.hpp>
+#include <algorithm>
+#include <functional>
+#include <string>
+
+template< class T >
+struct caster_to
+{
+ typedef T result_type;
+
+ T operator()( void* obj ) const
+ {
+ return static_cast<T>( obj );
+ }
+};
+
+template< class PtrSequence >
+void test_ptr_inserter_helper()
+{
+ using namespace boost;
+ PtrSequence seq;
+ const int size = 1000;
+ for( int i = 0; i != size; ++i )
+ seq.push_back( i % 3 == 0 ? 0 : new int(i) );
+
+ PtrSequence seq2;
+ //
+ // @remark: we call .base() to avoid null pointer indirection.
+ // The clone_inserter will handle the nulls correctly.
+ //
+ std::copy( boost::make_transform_iterator( seq.begin().base(), caster_to<int*>() ),
+ boost::make_transform_iterator( seq.end().base(), caster_to<int*>() ),
+ ptr_container::ptr_back_inserter( seq2 ) );
+
+ std::copy( boost::make_transform_iterator( seq.begin().base(), caster_to<int*>() ),
+ boost::make_transform_iterator( seq.end().base(), caster_to<int*>() ),
+ ptr_container::ptr_front_inserter( seq2 ) );
+ BOOST_CHECK_EQUAL( seq.size()*2, seq2.size() );
+
+ PtrSequence seq3;
+ for( int i = 0; i != size; ++i )
+ seq3.push_back( new int(i%3) );
+
+ //
+ // @remark: since there are no nulls in this container, it
+ // is easier to handle.
+ //
+ std::copy( seq3.begin(), seq3.end(),
+ ptr_container::ptr_inserter( seq, seq.end() ) );
+ BOOST_CHECK_EQUAL( seq.size(), seq2.size() );
+}
+
+
+void test_ptr_inserter()
+{
+ test_ptr_inserter_helper< boost::ptr_list< boost::nullable<int> > >();
+ test_ptr_inserter_helper< boost::ptr_deque< boost::nullable<int> > >();
+
+
+}
+
+
+
+#include <boost/test/unit_test.hpp>
+using boost::unit_test::test_suite;
+
+test_suite* init_unit_test_suite( int argc, char* argv[] )
+{
+ test_suite* test = BOOST_TEST_SUITE( "Pointer Container Test Suite" );
+
+ test->add( BOOST_TEST_CASE( &test_ptr_inserter ) );
+
+ return test;
+}
+
+
Modified: branches/release/tools/regression/test/test-cases/general/bjam.log
==============================================================================
--- branches/release/tools/regression/test/test-cases/general/bjam.log Mon Aug 12 09:40:52 2013 (r85320)
+++ branches/release/tools/regression/test/test-cases/general/bjam.log 2013-08-12 10:56:38 EDT (Mon, 12 Aug 2013) (r85321)
@@ -46,7 +46,7 @@
MkDir1 ..\..\..\bin.v2\tools\regression\test\compile-fail~pass.test\msvc-7.1\debug\link-static\threading-multi
compile-c-c++ ..\..\..\bin.v2\tools\regression\test\compile-fail~pass.test\msvc-7.1\debug\link-static\threading-multi\compile-fail~pass.obj
compile-fail~pass.cpp
-compile-fail~pass.cpp(9) : fatal error C1189: #error : example of a compile failure
+compile-fail~pass.cpp(9) : fatal error C1189: #error : example of a compile failure
(failed-as-expected) ..\..\..\bin.v2\tools\regression\test\compile-fail~pass.test\msvc-7.1\debug\link-static\threading-multi\compile-fail~pass.obj
**passed** ..\..\..\bin.v2\tools\regression\test\compile-fail~pass.test\msvc-7.1\debug\link-static\threading-multi\compile-fail~pass.test
MkDir1 ..\..\..\bin.v2\tools\regression\test\compile~fail.test
@@ -56,7 +56,7 @@
MkDir1 ..\..\..\bin.v2\tools\regression\test\compile~fail.test\msvc-7.1\debug\link-static\threading-multi
compile-c-c++ ..\..\..\bin.v2\tools\regression\test\compile~fail.test\msvc-7.1\debug\link-static\threading-multi\compile~fail.obj
compile~fail.cpp
-compile~fail.cpp(9) : fatal error C1189: #error : example of a compile failure
+compile~fail.cpp(9) : fatal error C1189: #error : example of a compile failure
call "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\vcvars32.bat" >nul
cl /Zm800 -nologo @"..\..\..\bin.v2\tools\regression\test\compile~fail.test\msvc-7.1\debug\link-static\threading-multi\compile~fail.obj.rsp"
@@ -145,7 +145,7 @@
MkDir1 ..\..\..\bin.v2\tools\regression\test\run-fail~compile-fail.test\msvc-7.1\debug\link-static\threading-multi
compile-c-c++ ..\..\..\bin.v2\tools\regression\test\run-fail~compile-fail.test\msvc-7.1\debug\link-static\threading-multi\run-fail~compile-fail.obj
run-fail~compile-fail.cpp
-run-fail~compile-fail.cpp(9) : fatal error C1189: #error : example of a compile failure
+run-fail~compile-fail.cpp(9) : fatal error C1189: #error : example of a compile failure
call "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\vcvars32.bat" >nul
cl /Zm800 -nologo @"..\..\..\bin.v2\tools\regression\test\run-fail~compile-fail.test\msvc-7.1\debug\link-static\threading-multi\run-fail~compile-fail.obj.rsp"