Subject: [Boost-commit] svn:boost r81515 - in trunk/libs/move: doc example proj/vc7ide test
From: igaztanaga_at_[hidden]
Date: 2012-11-24 16:03:26
Author: igaztanaga
Date: 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
New Revision: 81515
URL: http://svn.boost.org/trac/boost/changeset/81515
Log:
* Better header segregation (bug
[@https://svn.boost.org/trac/boost/ticket/6524 #6524]).
* Small documentation fixes
* Replaced deprecated BOOST_NO_XXXX with newer BOOST_NO_CXX11_XXX macros.
Text files modified:
trunk/libs/move/doc/Jamfile.v2 | 2
trunk/libs/move/doc/move.qbk | 15 ++++-
trunk/libs/move/example/copymovable.hpp | 6 +
trunk/libs/move/example/doc_clone_ptr.cpp | 5 +
trunk/libs/move/example/doc_construct_forward.cpp | 6 +
trunk/libs/move/example/doc_file_descriptor.cpp | 8 ++
trunk/libs/move/example/doc_how_works.cpp | 9 ++-
trunk/libs/move/example/doc_move_algorithms.cpp | 5 +
trunk/libs/move/example/doc_move_inserter.cpp | 12 +++-
trunk/libs/move/example/doc_move_iterator.cpp | 4 +
trunk/libs/move/example/movable.hpp | 7 ++
trunk/libs/move/proj/vc7ide/Move.sln | 106 +++------------------------------------
trunk/libs/move/test/back_move_inserter.cpp | 5 +
trunk/libs/move/test/construct_forward.cpp | 24 ++++----
trunk/libs/move/test/conversion_test.cpp | 20 ++++---
trunk/libs/move/test/copy_elision_test.cpp | 13 +++-
trunk/libs/move/test/copy_move_optimization.cpp | 4 +
trunk/libs/move/test/move.cpp | 8 +-
trunk/libs/move/test/move_algorithm.cpp | 5 +
trunk/libs/move/test/move_iterator.cpp | 55 +-------------------
20 files changed, 122 insertions(+), 197 deletions(-)
Modified: trunk/libs/move/doc/Jamfile.v2
==============================================================================
--- trunk/libs/move/doc/Jamfile.v2 (original)
+++ trunk/libs/move/doc/Jamfile.v2 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -13,7 +13,7 @@
doxygen autodoc
:
- [ glob ../../../boost/move/move.hpp ]
+ [ glob ../../../boost/move/*.hpp ]
:
<doxygen:param>HIDE_UNDOC_MEMBERS=YES
<doxygen:param>HIDE_UNDOC_MEMBERS=YES
Modified: trunk/libs/move/doc/move.qbk
==============================================================================
--- trunk/libs/move/doc/move.qbk (original)
+++ trunk/libs/move/doc/move.qbk 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -7,7 +7,7 @@
[library Boost.Move
[quickbook 1.5]
[authors [Gaztanaga, Ion]]
- [copyright 2008-2010 Ion Gaztanaga]
+ [copyright 2008-2012 Ion Gaztanaga]
[id move]
[dirname move]
[purpose Move semantics]
@@ -318,7 +318,7 @@
[import ../example/doc_construct_forward.cpp]
[construct_forward_example]
-Constructor forwarding comes handful to implement placement insertion in containers with
+Constructor forwarding comes in handy to implement placement insertion in containers with
just N overloads if the implementor accepts the limitations of this type of forwarding for
C++03 compilers. In compilers with rvalue references perfect forwarding is achieved.
@@ -778,7 +778,7 @@
[section:thanks_to Thanks and credits]
Thanks to all that developed ideas for move emulation: the first emulation was based on Howard Hinnant
-emulation code for `unique_ptr`, David Abrahams suggested the use of `class rv` class,
+emulation code for `unique_ptr`, David Abrahams suggested the use of `class rv`,
and Klaus Triendl discovered how to bind const rlvalues using `class rv`.
Many thanks to all boosters that have tested, reviewed and improved the library.
@@ -787,6 +787,15 @@
[section:release_notes Release Notes]
+[section:release_notes_boost_1_53_00 Boost 1.53 Release]
+
+* Better header segregation (bug
+ [@https://svn.boost.org/trac/boost/ticket/6524 #6524]).
+* Small documentation fixes
+* Replaced deprecated BOOST_NO_XXXX with newer BOOST_NO_CXX11_XXX macros.
+
+[endsect]
+
[section:release_notes_boost_1_51_00 Boost 1.51 Release]
* Fixed bugs
Modified: trunk/libs/move/example/copymovable.hpp
==============================================================================
--- trunk/libs/move/example/copymovable.hpp (original)
+++ trunk/libs/move/example/copymovable.hpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -11,9 +11,11 @@
#ifndef BOOST_MOVE_TEST_COPYMOVABLE_HPP
#define BOOST_MOVE_TEST_COPYMOVABLE_HPP
+#include <boost/move/detail/config_begin.hpp>
+
//[movable_definition
//header file "copy_movable.hpp"
-#include <boost/move/move.hpp>
+#include <boost/move/core.hpp>
//A copy_movable class
class copy_movable
@@ -43,4 +45,6 @@
//]
+#include <boost/move/detail/config_end.hpp>
+
#endif //BOOST_MOVE_TEST_COPYMOVABLE_HPP
Modified: trunk/libs/move/example/doc_clone_ptr.cpp
==============================================================================
--- trunk/libs/move/example/doc_clone_ptr.cpp (original)
+++ trunk/libs/move/example/doc_clone_ptr.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -8,7 +8,8 @@
// See http://www.boost.org/libs/move for documentation.
//
//////////////////////////////////////////////////////////////////////////////
-#include <boost/move/move.hpp>
+#include <boost/move/detail/config_begin.hpp>
+#include <boost/move/utility.hpp>
//[clone_ptr_base_derived
class Base
@@ -152,3 +153,5 @@
//]
return 0;
}
+
+#include <boost/move/detail/config_end.hpp>
Modified: trunk/libs/move/example/doc_construct_forward.cpp
==============================================================================
--- trunk/libs/move/example/doc_construct_forward.cpp (original)
+++ trunk/libs/move/example/doc_construct_forward.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -9,8 +9,10 @@
//
//////////////////////////////////////////////////////////////////////////////
+#include <boost/move/detail/config_begin.hpp>
+
//[construct_forward_example
-#include <boost/move/move.hpp>
+#include <boost/move/utility.hpp>
#include <iostream>
class copyable_only_tester
@@ -103,3 +105,5 @@
return 0;
}
//]
+
+#include <boost/move/detail/config_end.hpp>
Modified: trunk/libs/move/example/doc_file_descriptor.cpp
==============================================================================
--- trunk/libs/move/example/doc_file_descriptor.cpp (original)
+++ trunk/libs/move/example/doc_file_descriptor.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztanaga 2008-2009.
+// (C) Copyright Ion Gaztanaga 2008-2012.
// 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)
@@ -9,9 +9,11 @@
//
//////////////////////////////////////////////////////////////////////////////
+#include <boost/move/detail/config_begin.hpp>
+
//[file_descriptor_def
-#include <boost/move/move.hpp>
+#include <boost/move/utility.hpp>
#include <stdexcept>
class file_descriptor
@@ -85,3 +87,5 @@
return 0;
}
//]
+
+#include <boost/move/detail/config_end.hpp>
Modified: trunk/libs/move/example/doc_how_works.cpp
==============================================================================
--- trunk/libs/move/example/doc_how_works.cpp (original)
+++ trunk/libs/move/example/doc_how_works.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -11,7 +11,7 @@
#include <boost/config.hpp>
-#if !defined(BOOST_NO_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
int main()
{
@@ -20,8 +20,10 @@
#else
+#include <boost/move/detail/config_begin.hpp>
+
//[how_works_example
-#include <boost/move/move.hpp>
+#include <boost/move/core.hpp>
#include <iostream>
class sink_tester
@@ -56,5 +58,6 @@
}
//]
-#endif
+#include <boost/move/detail/config_end.hpp>
+#endif
Modified: trunk/libs/move/example/doc_move_algorithms.cpp
==============================================================================
--- trunk/libs/move/example/doc_move_algorithms.cpp (original)
+++ trunk/libs/move/example/doc_move_algorithms.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -9,8 +9,11 @@
//
//////////////////////////////////////////////////////////////////////////////
+#include <boost/move/detail/config_begin.hpp>
+
//[move_algorithms_example
#include "movable.hpp"
+#include <boost/move/algorithm.hpp>
#include <cassert>
#include <boost/aligned_storage.hpp>
@@ -39,3 +42,5 @@
return 0;
}
//]
+
+#include <boost/move/detail/config_end.hpp>
Modified: trunk/libs/move/example/doc_move_inserter.cpp
==============================================================================
--- trunk/libs/move/example/doc_move_inserter.cpp (original)
+++ trunk/libs/move/example/doc_move_inserter.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -9,10 +9,13 @@
//
//////////////////////////////////////////////////////////////////////////////
+#include <boost/move/detail/config_begin.hpp>
+
//[move_inserter_example
#include <boost/container/list.hpp>
#include "movable.hpp"
#include <cassert>
+#include <algorithm>
using namespace ::boost::container;
@@ -27,10 +30,9 @@
assert(!l.begin()->moved());
l2.clear();
- //Move construct
- for(l_iterator itbeg = l.begin(), itend = l.end(); itbeg != itend; ++itbeg){
- *mit = *itbeg;
- }
+ //Move insert into l2 containers
+ std::copy(l.begin(), l.end(), mit);
+
//Check size and status
assert(l2.size() == l.size());
assert(l.begin()->moved());
@@ -46,3 +48,5 @@
return 0;
}
//]
+
+#include <boost/move/detail/config_end.hpp>
Modified: trunk/libs/move/example/doc_move_iterator.cpp
==============================================================================
--- trunk/libs/move/example/doc_move_iterator.cpp (original)
+++ trunk/libs/move/example/doc_move_iterator.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -8,7 +8,7 @@
// See http://www.boost.org/libs/move for documentation.
//
//////////////////////////////////////////////////////////////////////////////
-
+#include <boost/move/detail/config_begin.hpp>
//[move_iterator_example
#include <boost/container/vector.hpp>
#include "movable.hpp"
@@ -37,3 +37,5 @@
return 0;
}
//]
+
+#include <boost/move/detail/config_end.hpp>
Modified: trunk/libs/move/example/movable.hpp
==============================================================================
--- trunk/libs/move/example/movable.hpp (original)
+++ trunk/libs/move/example/movable.hpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -11,9 +11,12 @@
#ifndef BOOST_MOVE_TEST_MOVABLE_HPP
#define BOOST_MOVE_TEST_MOVABLE_HPP
+#include <boost/move/detail/config_begin.hpp>
+
//[movable_definition
//header file "movable.hpp"
-#include <boost/move/move.hpp>
+#include <boost/move/core.hpp>
+#include <boost/move/traits.hpp>
//A movable class
class movable
@@ -46,4 +49,6 @@
} //namespace boost{
//]
+#include <boost/move/detail/config_end.hpp>
+
#endif //BOOST_MOVE_TEST_MOVABLE_HPP
Modified: trunk/libs/move/proj/vc7ide/Move.sln
==============================================================================
--- trunk/libs/move/proj/vc7ide/Move.sln (original)
+++ trunk/libs/move/proj/vc7ide/Move.sln 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -1,52 +1,4 @@
Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "construct_forward_test", "construct_forward_test.vcproj", "{CD57C283-1862-42FE-BF87-B96D3A2A7912}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "move_iterator_test", "move_iterator_test.vcproj", "{C8AD2618-79EB-8612-42FE-2A3AC9667A13}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "move_test", "move_test.vcproj", "{CD57C283-1862-42FE-BF87-B96D3A2A7912}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "move_algorithm_test", "move_algorithm.vcproj", "{C8AD2618-79EB-8612-42FE-2A3AC9667A13}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc_clone_ptr", "doc_clone_ptr.vcproj", "{CD57C283-1862-42FE-BF87-B96D3A2A7912}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc_file_descriptor", "doc_file_descriptor.vcproj", "{CD57C283-1862-42FE-BF87-B96D3A2A7912}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc_move_iterator", "doc_move_iterator.vcproj", "{CD57C283-1862-42FE-BF87-B96D3A2A7912}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc_move_inserter", "doc_move_inserter.vcproj", "{CD57C283-1862-42FE-BF87-B96D3A2A7912}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc_move_algorithms", "doc_move_algorithms.vcproj", "{CD57C283-1862-42FE-BF87-B96D3A2A7912}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc_construct_forward", "doc_construct_forward.vcproj", "{CD57C283-1862-42FE-BF87-B96D3A2A7912}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "back_move_inserter_test", "back_move_inserter_test.vcproj", "{C8AD2618-79EB-8612-42FE-2A3AC9667A13}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_move_optimization_test", "copy_move_optimization.vcproj", "{C8AD2618-79EB-8612-42FE-2A3AC9667A13}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_elision_test_test", "copy_elision_test.vcproj", "{C8AD2618-79EB-8612-42FE-2A3AC9667A13}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
@@ -67,54 +19,6 @@
GlobalSection(ProjectDependencies) = postSolution
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.ActiveCfg = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.Build.0 = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.ActiveCfg = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.Build.0 = Release|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Debug.ActiveCfg = Debug|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Debug.Build.0 = Debug|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Release.ActiveCfg = Release|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Release.Build.0 = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.ActiveCfg = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.Build.0 = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.ActiveCfg = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.Build.0 = Release|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Debug.ActiveCfg = Debug|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Debug.Build.0 = Debug|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Release.ActiveCfg = Release|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Release.Build.0 = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.ActiveCfg = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.Build.0 = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.ActiveCfg = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.Build.0 = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.ActiveCfg = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.Build.0 = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.ActiveCfg = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.Build.0 = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.ActiveCfg = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.Build.0 = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.ActiveCfg = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.Build.0 = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.ActiveCfg = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.Build.0 = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.ActiveCfg = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.Build.0 = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.ActiveCfg = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.Build.0 = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.ActiveCfg = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.Build.0 = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.ActiveCfg = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Debug.Build.0 = Debug|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.ActiveCfg = Release|Win32
- {CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.Build.0 = Release|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Debug.ActiveCfg = Debug|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Debug.Build.0 = Debug|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Release.ActiveCfg = Release|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Release.Build.0 = Release|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Debug.ActiveCfg = Debug|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Debug.Build.0 = Debug|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Release.ActiveCfg = Release|Win32
- {C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Release.Build.0 = Release|Win32
{C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Debug.ActiveCfg = Debug|Win32
{C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Debug.Build.0 = Debug|Win32
{C8AD2618-79EB-8612-42FE-2A3AC9667A13}.Release.ActiveCfg = Release|Win32
@@ -129,10 +33,18 @@
{CD57C283-1862-42FE-BF87-B96D3A2A7912}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
+ ..\..\..\..\boost\move\algorithm.hpp = ..\..\..\..\boost\move\algorithm.hpp
+ ..\..\..\..\boost\move\detail\config_begin.hpp = ..\..\..\..\boost\move\detail\config_begin.hpp
+ ..\..\..\..\boost\move\detail\config_end.hpp = ..\..\..\..\boost\move\detail\config_end.hpp
+ ..\..\..\..\boost\move\core.hpp = ..\..\..\..\boost\move\core.hpp
+ ..\..\..\..\boost\move\iterator.hpp = ..\..\..\..\boost\move\iterator.hpp
..\..\doc\Jamfile.v2 = ..\..\doc\Jamfile.v2
+ ..\..\..\..\boost\move\detail\meta_utils.hpp = ..\..\..\..\boost\move\detail\meta_utils.hpp
..\..\..\..\boost\move\move.hpp = ..\..\..\..\boost\move\move.hpp
..\..\doc\move.qbk = ..\..\doc\move.qbk
- ..\..\..\..\boost\move\move_helpers.hpp = ..\..\..\..\boost\move\move_helpers.hpp
+ ..\..\..\..\boost\move\detail\move_helpers.hpp = ..\..\..\..\boost\move\detail\move_helpers.hpp
+ ..\..\..\..\boost\move\traits.hpp = ..\..\..\..\boost\move\traits.hpp
+ ..\..\..\..\boost\move\utility.hpp = ..\..\..\..\boost\move\utility.hpp
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
Modified: trunk/libs/move/test/back_move_inserter.cpp
==============================================================================
--- trunk/libs/move/test/back_move_inserter.cpp (original)
+++ trunk/libs/move/test/back_move_inserter.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -8,7 +8,8 @@
// See http://www.boost.org/libs/move for documentation.
//
//////////////////////////////////////////////////////////////////////////////
-#include <boost/move/move.hpp>
+#include <boost/move/detail/config_begin.hpp>
+#include <boost/move/iterator.hpp>
#include <boost/container/deque.hpp>
#include <boost/container/list.hpp>
#include <boost/container/stable_vector.hpp>
@@ -72,3 +73,5 @@
}
return 0;
}
+
+#include <boost/move/detail/config_end.hpp>
Modified: trunk/libs/move/test/construct_forward.cpp
==============================================================================
--- trunk/libs/move/test/construct_forward.cpp (original)
+++ trunk/libs/move/test/construct_forward.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright David Abrahams, Vicente Botet, Ion Gaztanaga 2009-2011.
+// (C) Copyright David Abrahams, Vicente Botet, Ion Gaztanaga 2009-2012.
// 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)
@@ -8,8 +8,8 @@
// See http://www.boost.org/libs/move for documentation.
//
//////////////////////////////////////////////////////////////////////////////
-
-#include <boost/move/move.hpp>
+#include <boost/move/detail/config_begin.hpp>
+#include <boost/move/utility.hpp>
#include <boost/utility/enable_if.hpp>
#include "../example/movable.hpp"
#include "../example/copymovable.hpp"
@@ -24,36 +24,36 @@
template<class MaybeRvalue>
void catch_test(BOOST_RV_REF(MaybeRvalue) x
- #ifdef BOOST_NO_RVALUE_REFERENCES
+ #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
,typename ::boost::enable_if< ::boost::has_move_emulation_enabled<MaybeRvalue> >::type* = 0
- #endif //BOOST_NO_RVALUE_REFERENCES
+ #endif //BOOST_NO_CXX11_RVALUE_REFERENCES
)
{ (void)x;}
template<class MaybeRvalue>
void catch_test(BOOST_COPY_ASSIGN_REF(MaybeRvalue) x
- #ifdef BOOST_NO_RVALUE_REFERENCES
+ #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
,typename ::boost::enable_if< ::boost::has_move_emulation_enabled<MaybeRvalue> >::type* = 0
- #endif //BOOST_NO_RVALUE_REFERENCES
+ #endif //BOOST_NO_CXX11_RVALUE_REFERENCES
)
{ (void)x;}
template<class MaybeRvalue>
void catch_test(MaybeRvalue &x
- #ifdef BOOST_NO_RVALUE_REFERENCES
+ #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
,typename ::boost::enable_if< ::boost::has_move_emulation_enabled<MaybeRvalue> >::type* = 0
- #endif //BOOST_NO_RVALUE_REFERENCES
+ #endif //BOOST_NO_CXX11_RVALUE_REFERENCES
)
{ (void)x;}
- #ifdef BOOST_NO_RVALUE_REFERENCES
+ #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
template<class MaybeRvalue>
void catch_test(const MaybeRvalue& x
,typename ::boost::disable_if< ::boost::has_move_emulation_enabled<MaybeRvalue> >::type* = 0
)
{ (void)x;}
- #endif //BOOST_NO_RVALUE_REFERENCES
+ #endif //BOOST_NO_CXX11_RVALUE_REFERENCES
movable create_movable()
{ return movable(); }
@@ -113,3 +113,5 @@
forward_test();
return 0;
}
+
+#include <boost/move/detail/config_end.hpp>
Modified: trunk/libs/move/test/conversion_test.cpp
==============================================================================
--- trunk/libs/move/test/conversion_test.cpp (original)
+++ trunk/libs/move/test/conversion_test.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright David Abrahams, Vicente Botet, Ion Gaztanaga 2010-2011.
+// (C) Copyright David Abrahams, Vicente Botet, Ion Gaztanaga 2010-2012.
// 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)
@@ -8,12 +8,14 @@
// See http://www.boost.org/libs/move for documentation.
//
//////////////////////////////////////////////////////////////////////////////
-#include <boost/move/move.hpp>
+#include <boost/move/detail/config_begin.hpp>
+#include <boost/move/utility.hpp>
#include <boost/type_traits/aligned_storage.hpp>
#include <boost/type_traits/is_class.hpp>
#include <cassert>
-#include <boost/move/move_helpers.hpp>
+#include <new>
+#include <boost/move/detail/move_helpers.hpp>
enum ConstructionType { Copied, Moved, Other };
@@ -105,11 +107,11 @@
template<class U>
void priv_push_back(BOOST_MOVE_CATCH_FWD(U) x)
- { new (&storage_) T(::boost::forward<U>(x)); }
+ { ::new (&storage_) T(::boost::forward<U>(x)); }
template<class U>
iterator priv_insert(const_iterator, BOOST_MOVE_CATCH_FWD(U) x)
- { new (&storage_) T(::boost::forward<U>(x)); return 0; }
+ { ::new (&storage_) T(::boost::forward<U>(x)); return 0; }
};
@@ -292,8 +294,10 @@
return 0;
}
+#include <boost/move/detail/config_end.hpp>
+
/*
-#include <boost/move/move.hpp>
+#include <boost/move/utility.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/mpl/if.hpp>
@@ -366,7 +370,7 @@
struct not_a_type;
-#if defined(BOOST_NO_RVALUE_REFERENCES)
+#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
#define BOOST_MOVE_CATCH_CONST(U) \
typename ::boost::mpl::if_< ::boost::is_class<T>, BOOST_CATCH_CONST_RLVALUE(U), const U &>::type
#define BOOST_MOVE_CATCH_RVALUE(U)\
@@ -470,7 +474,7 @@
{ return priv_push_back(::boost::move(x)); }
//Tricks for C++03
- #if defined(BOOST_NO_RVALUE_REFERENCES)
+ #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
void push_back(T &x)
{ priv_push_back(const_cast<const T &>(x)); }
Modified: trunk/libs/move/test/copy_elision_test.cpp
==============================================================================
--- trunk/libs/move/test/copy_elision_test.cpp (original)
+++ trunk/libs/move/test/copy_elision_test.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -2,6 +2,7 @@
// Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#include <boost/move/detail/config_begin.hpp>
#include <iostream>
#ifdef NO_MOVE
@@ -11,7 +12,7 @@
# define BOOST_COPYABLE_AND_MOVABLE(X)
# define MOVE(x) (x)
#else
-#include <boost/move/move.hpp>
+#include <boost/move/utility.hpp>
# define MOVE(x) boost::move(x)
#endif
@@ -91,17 +92,17 @@
struct trace
{
trace(char const* name)
- : name(name)
+ : m_name(name)
{
- std::cout << "->: " << name << "\n";
+ std::cout << "->: " << m_name << "\n";
}
~trace()
{
- std::cout << "<-: " << name << "\n";
+ std::cout << "<-: " << m_name << "\n";
}
- char const* name;
+ char const* m_name;
};
void sink(X a)
@@ -168,3 +169,5 @@
CHECK_COPIES( X a = ternary( argc != 1000 ), 0, 2, "Return result of ternary operation again" );
return 0;
}
+
+#include <boost/move/detail/config_end.hpp>
Modified: trunk/libs/move/test/copy_move_optimization.cpp
==============================================================================
--- trunk/libs/move/test/copy_move_optimization.cpp (original)
+++ trunk/libs/move/test/copy_move_optimization.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -8,7 +8,8 @@
//Optimization:
//Since RVO is better than move-construction,
//avoid copy constructor overloading.
-#include <boost/move/move.hpp>
+#include <boost/move/detail/config_begin.hpp>
+#include <boost/move/utility.hpp>
#include <iostream>
bool moved = false;
@@ -103,3 +104,4 @@
//1 const rv<T> & constructor: copy constructor
//1 T & constructor: copy constructor
+#include <boost/move/detail/config_end.hpp>
Modified: trunk/libs/move/test/move.cpp
==============================================================================
--- trunk/libs/move/test/move.cpp (original)
+++ trunk/libs/move/test/move.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -8,8 +8,8 @@
// See http://www.boost.org/libs/move for documentation.
//
//////////////////////////////////////////////////////////////////////////////
-
-#include <boost/move/move.hpp>
+#include <boost/move/detail/config_begin.hpp>
+#include <boost/move/utility.hpp>
#include "../example/movable.hpp"
#include <boost/static_assert.hpp>
@@ -64,7 +64,7 @@
{ return movable(); }
int main()
{
- #if defined(BOOST_NO_RVALUE_REFERENCES)
+ #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
BOOST_STATIC_ASSERT((boost::has_nothrow_move<movable>::value == true));
BOOST_STATIC_ASSERT((boost::has_nothrow_move<copyable>::value == false));
BOOST_STATIC_ASSERT((boost::has_move_emulation_enabled<copyable>::value == false));
@@ -112,3 +112,5 @@
return 0;
}
+
+#include <boost/move/detail/config_end.hpp>
Modified: trunk/libs/move/test/move_algorithm.cpp
==============================================================================
--- trunk/libs/move/test/move_algorithm.cpp (original)
+++ trunk/libs/move/test/move_algorithm.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -8,7 +8,8 @@
// See http://www.boost.org/libs/move for documentation.
//
//////////////////////////////////////////////////////////////////////////////
-#include <boost/move/move.hpp>
+#include <boost/move/detail/config_begin.hpp>
+#include <boost/move/algorithm.hpp>
#include <boost/container/vector.hpp>
#include "../example/movable.hpp"
@@ -53,3 +54,5 @@
return 0;
}
+
+#include <boost/move/detail/config_end.hpp>
Modified: trunk/libs/move/test/move_iterator.cpp
==============================================================================
--- trunk/libs/move/test/move_iterator.cpp (original)
+++ trunk/libs/move/test/move_iterator.cpp 2012-11-24 16:03:23 EST (Sat, 24 Nov 2012)
@@ -8,8 +8,8 @@
// See http://www.boost.org/libs/move for documentation.
//
//////////////////////////////////////////////////////////////////////////////
-
-#include <boost/move/move.hpp>
+#include <boost/move/detail/config_begin.hpp>
+#include <boost/move/iterator.hpp>
#include <boost/container/vector.hpp>
#include "../example/movable.hpp"
@@ -52,53 +52,4 @@
return 0;
}
-/*
-#include <boost/move/move.hpp>
-
-
-class copy_movable
-{
- BOOST_COPYABLE_AND_MOVABLE(copy_movable)
- int value_;
-
- public:
- copy_movable() : value_(1){}
-
- //Move constructor and assignment
- copy_movable(BOOST_RV_REF(copy_movable) m)
- { value_ = m.value_; m.value_ = 0; }
-
- copy_movable(const copy_movable &m)
- { value_ = m.value_; }
-
- copy_movable & operator=(BOOST_RV_REF(copy_movable) m)
- { value_ = m.value_; m.value_ = 0; return *this; }
-
- copy_movable & operator=(BOOST_COPY_ASSIGN_REF(copy_movable) m)
- { value_ = m.value_; return *this; }
-
- bool moved() const //Observer
- { return value_ == 0; }
-};
-
-struct copy_movable_wrapper
-{
- copy_movable cm;
-};
-
-copy_movable produce()
-{ return copy_movable(); }
-
-
-int main()
-{
- copy_movable cm;
- cm = produce();
-
- const copy_movable_wrapper cmw;
- copy_movable_wrapper cmw2;
- cmw2 = cmw;
-
- return 0;
-}
-*/
\ No newline at end of file
+#include <boost/move/detail/config_end.hpp>