Changeset 3334

Timestamp:

01/30/10 14:05:10 (7 weeks ago)

Author:

trichards

Message:

Fixed a few syntax errors caught by gcc.

Location:

Core/branches/0075_TR_SCRIPTING

Files:

• Event/src/Event_impl.hpp (modified) (1 diff)
• Scripting/script_arity_conversion.hpp (modified) (2 diffs)
• Scripting/script_convert_argument.hpp (modified) (2 diffs)

Core/branches/0075_TR_SCRIPTING/Event/src/Event_impl.hpp

@@ -34 +34 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 class EventQueue;
+class EventService;
 class Connection_impl;
 

Core/branches/0075_TR_SCRIPTING/Scripting/script_arity_conversion.hpp

@@ -3 +3 @@
 
 #define Q BOOST_PP_ITERATION()
-typename boost::remove_const<boost::remove_reference<BOOST_PP_CAT(parmType, Q)>::type>::type BOOST_PP_CAT(parm, Q);
+typename boost::remove_const<typename boost::remove_reference<BOOST_PP_CAT(parmType, Q)>::type>::type BOOST_PP_CAT(parm, Q);
     try
     {
         script_convert_argument<typename boost::remove_reference<BOOST_PP_CAT(parmType, Q)>::type> convert;
-        BOOST_PP_CAT(parm, Q) = (boost::remove_const<boost::remove_reference<BOOST_PP_CAT(parmType, Q)>::type>::type)
+        BOOST_PP_CAT(parm, Q) = (typename boost::remove_const<typename boost::remove_reference<BOOST_PP_CAT(parmType, Q)>::type>::type)
             convert(_parms[Q]);
     }
@@ -13 +13 @@
     {
         std::stringstream errorMessage;
-        errorMessage << "Bad cast to " << typeid(boost::remove_reference<BOOST_PP_CAT(parmType, Q)>::type).name()
+        errorMessage << "Bad cast to " << typeid(typename boost::remove_reference<BOOST_PP_CAT(parmType, Q)>::type).name()
             << " for parameter " << Q << " (" << _e.what() << ")";
         throw Zen::Utility::runtime_exception(errorMessage.str());

Core/branches/0075_TR_SCRIPTING/Scripting/script_convert_argument.hpp

@@ -46 +46 @@
     operator()(boost::any& _parm)
     {
-        return boost::any_cast<typename type>(_parm);
+        return boost::any_cast<type>(_parm);
     }
 };
@@ -61 +61 @@
     operator()(boost::any& _parm)
     {
-        return boost::any_cast<typename type>(_parm);
+        return boost::any_cast<type>(_parm);
     }
 };