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

Subject: [Boost-commit] svn:boost r65696 - trunk/boost/msm/back
From: christophe.j.henry_at_[hidden]
Date: 2010-09-30 15:14:25

Author: chenry
Date: 2010-09-30 15:14:23 EDT (Thu, 30 Sep 2010)
New Revision: 65696
URL: http://svn.boost.org/trac/boost/changeset/65696

Log:
workaround for VC7.1
Text files modified: 
   trunk/boost/msm/back/state_machine.hpp |    11 ++++++-----                             
   1 files changed, 6 insertions(+), 5 deletions(-)

Modified: trunk/boost/msm/back/state_machine.hpp
==============================================================================
--- trunk/boost/msm/back/state_machine.hpp	(original)
+++ trunk/boost/msm/back/state_machine.hpp	2010-09-30 15:14:23 EDT (Thu, 30 Sep 2010)
@@ -1704,7 +1704,8 @@
 
 // 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)
-#if defined (__IBMCPP__) || (defined (__APPLE_CC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 1) )
+// and also to MS VC < 8
+#if defined (__IBMCPP__) || (defined (__APPLE_CC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 1)) || (defined(_MSC_VER) && (_MSC_VER < 1400))
      public:
 #endif
     template<class ContainingSM>
@@ -1713,7 +1714,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) )
+#if defined (__IBMCPP__) || (defined (__APPLE_CC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 1)) || (defined(_MSC_VER) && (_MSC_VER < 1400))
      private:
 #endif
     // A function object for use with mpl::for_each that stuffs
@@ -2072,8 +2073,8 @@
         m_history.history_exit(this->m_states);
      }
 
-    // the IBM compiler seems to have problems with the friend declaration of dispatch_table
-#if defined (__IBMCPP__)
+    // the IBM and VC<8 compilers seem to have problems with the friend declaration of dispatch_table
+#if defined (__IBMCPP__) || (defined(_MSC_VER) && (_MSC_VER < 1400))
      public:
 #endif
     // no transition for event.
@@ -2096,7 +2097,7 @@
     {
         return HANDLED_FALSE;
     }
-#if defined (__IBMCPP__)
+#if defined (__IBMCPP__) || (defined(_MSC_VER) && (_MSC_VER < 1400))
      private:
 #endif
     // puts a deferred event in the queue