Ticket #4156: boost-statechart-fixes.patch

boost/statechart/simple_state.hpp

@@ -727 +727 @@
         context< termination_state_type >() );
       const typename
         common_context_type::inner_context_ptr_type pCommonContext(
-          terminationState.context_ptr< common_context_type >() );
+          terminationState.template context_ptr< common_context_type >() );
       outermost_context_base_type & outermostContextBase(
         pCommonContext->outermost_context_base() );
 
@@ -949 +949 @@
       template< class State >
       static void check_store_deep_history_impl( State & stt )
       {
-        stt.store_deep_history_impl< MostDerived >();
+        stt.template store_deep_history_impl< MostDerived >();
       }
     };
     friend struct check_store_deep_history_impl_yes;

libs/statechart/example/Handcrafted/Handcrafted.cpp

@@ -51 +51 @@
 class state : public state_base
 {
   public:
+    state() : state_base() { }
+
     static const Derived & instance()
     {
       return instance_;
@@ -92 +94 @@
 
 
 //////////////////////////////////////////////////////////////////////////////
-class EvFlipBit : public event< EvFlipBit > {};
+class EvFlipBit : public event< EvFlipBit > {
+public:
+  EvFlipBit() : event < EvFlipBit >() { }
+};
 const EvFlipBit flip;
 
 class BitMachine
@@ -110 +115 @@
     //////////////////////////////////////////////////////////////////////////
     struct On : state< On >
     {
+      On() : state<On>() { }
+
       virtual const state_base & react( const EvFlipBit & ) const
       {
         return Off::instance();
@@ -118 +125 @@
 
     struct Off : state< Off >
     {
+      Off() : state<Off>() { }
+
       virtual const state_base & react( const EvFlipBit & ) const
       {
         return On::instance();