[Boost-commit] svn:boost r68535 - trunk/boost/msm/back

Subject: [Boost-commit] svn:boost r68535 - trunk/boost/msm/back
From: christophe.j.henry_at_[hidden]
Date: 2011-01-28 16:20:26

Author: chenry
Date: 2011-01-28 16:20:23 EST (Fri, 28 Jan 2011)
New Revision: 68535
URL: http://svn.boost.org/trac/boost/changeset/68535

Log:
Fixed trac 5117
Text files modified: 
   trunk/boost/msm/back/state_machine.hpp |    12 ++++++------                            
   1 files changed, 6 insertions(+), 6 deletions(-)

Modified: trunk/boost/msm/back/state_machine.hpp
==============================================================================
--- trunk/boost/msm/back/state_machine.hpp	(original)
+++ trunk/boost/msm/back/state_machine.hpp	2011-01-28 16:20:23 EST (Fri, 28 Jan 2011)
@@ -1923,7 +1923,7 @@
 // the IBM compiler seems to have problems with nested classes
 // the same seems to apply to the Apple version of gcc 4.0.1 (just in case we do for < 4.1)
 // and also to MS VC < 8
-#if defined (__IBMCPP__) || (defined (__APPLE_CC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 1)) || (defined(_MSC_VER) && (_MSC_VER < 1400))
+#if defined (__IBMCPP__) || (__GNUC__ == 4 && __GNUC_MINOR__ < 1) || (defined(_MSC_VER) && (_MSC_VER < 1400))
      public:
 #endif
     template<class ContainingSM>
@@ -1932,7 +1932,7 @@
         m_is_included=true;
         ::boost::fusion::for_each(m_substate_list,add_state<ContainingSM>(this,sm));
     }
-#if defined (__IBMCPP__) || (defined (__APPLE_CC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 1)) || (defined(_MSC_VER) && (_MSC_VER < 1400))
+#if defined (__IBMCPP__) || (__GNUC__ == 4 && __GNUC_MINOR__ < 1) || (defined(_MSC_VER) && (_MSC_VER < 1400))
      private:
 #endif
     // A function object for use with mpl::for_each that stuffs
@@ -2348,8 +2348,8 @@
     }
     // removes one event from the message queue and processes it
     template <class StateType>
-    typename ::boost::disable_if<typename is_no_message_queue<StateType>::type,void >::type
-    process_message_queue(StateType*)
+    void process_message_queue(StateType*, 
+                               typename ::boost::disable_if<typename is_no_message_queue<StateType>::type,void >::type* = 0)
     {
         if (!m_events_queue.m_events_queue.empty())
         {
@@ -2359,8 +2359,8 @@
         }
     }
     template <class StateType>
-    typename ::boost::enable_if<typename is_no_message_queue<StateType>::type,void >::type
-        process_message_queue(StateType*)
+    void process_message_queue(StateType*, 
+                               typename ::boost::enable_if<typename is_no_message_queue<StateType>::type,void >::type* = 0)
     {
         // nothing to process
     }