Merge branch 'master' into 2011-09-09-CxScript

Conflicts:
	include/chaiscript/dispatchkit/boxed_number.hpp
	include/chaiscript/dispatchkit/dispatchkit.hpp

include/chaiscript/dispatchkit/boxed_number.hpp

@@ -13,13 +13,21 @@
 namespace chaiscript 
 {
  
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable : 4244 4018 4389 4146)
+#endif
+
   /// \brief Represents any numeric type, generically. Used internally for generic operations between POD values
   class Boxed_Number
   {
     private:
       struct boolean
       {
+
+#ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wsign-compare"
+#endif
         template<typename T, typename U>
         static Boxed_Value go(Operators::Opers t_oper, const T &t, const U &u, const Boxed_Value &)
         {
@@ -696,7 +704,11 @@ namespace chaiscript
       {
       };  
   }
-  
+
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+
 }