Update of /cvsroot/boost/boost/boost/statechart
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26769/boost/statechart
Modified Files:
deep_history.hpp shallow_history.hpp simple_state.hpp
Log Message:
Removed a compile-time check to enable "local" history as defined in UML2.0.
Adapted test accordingly.
Index: deep_history.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/statechart/deep_history.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- deep_history.hpp 10 May 2005 18:23:14 -0000 1.9
+++ deep_history.hpp 5 Jun 2006 18:51:20 -0000 1.10
@@ -44,8 +44,6 @@
typedef typename DefaultState::context_type_list context_type_list;
typedef typename DefaultState::orthogonal_position orthogonal_position;
- typedef mpl::bool_< true > history_destination;
-
static void deep_construct(
const context_ptr_type & pContext,
outermost_context_base_type & outermostContextBase )
Index: shallow_history.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/statechart/shallow_history.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- shallow_history.hpp 10 May 2005 18:23:15 -0000 1.9
+++ shallow_history.hpp 5 Jun 2006 18:51:20 -0000 1.10
@@ -44,8 +44,6 @@
typedef typename DefaultState::context_type_list context_type_list;
typedef typename DefaultState::orthogonal_position orthogonal_position;
- typedef mpl::bool_< true > history_destination;
-
static void deep_construct(
const context_ptr_type & pContext,
outermost_context_base_type & outermostContextBase )
Index: simple_state.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/statechart/simple_state.hpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- simple_state.hpp 9 Apr 2006 11:18:46 -0000 1.36
+++ simple_state.hpp 5 Jun 2006 18:51:20 -0000 1.37
@@ -430,8 +430,6 @@
inherited_deep_history,
mpl::empty< inner_initial_list > >::type stores_deep_history;
- typedef mpl::bool_< false > history_destination;
-
void * operator new( std::size_t size )
{
return detail::allocate< MostDerived,
@@ -716,19 +714,6 @@
possible_transition_contexts,
termination_state_position >::type termination_state_type;
- // If you receive a
- // "use of undefined type 'boost::STATIC_ASSERTION_FAILURE<x>'" or
- // similar compiler error here then you tried to make a transition to
- // history from a state residing on the same level as the history
- // connector (or from a direct or indirect inner state). Since the
- // outer state has never been left no history has ever been saved.
- BOOST_STATIC_ASSERT( (
- mpl::or_<
- mpl::not_< typename DestinationState::history_destination >,
- mpl::not_< is_same<
- typename DestinationState::context_type,
- common_context_type > > >::value ) );
-
termination_state_type & terminationState(
context< termination_state_type >() );
const typename
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
