Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts: include/chaiscript/dispatchkit/bootstrap.hpp include/chaiscript/dispatchkit/proxy_functions_detail.hpp src/reflection.cpp
2014-02-22 16:41:28 -07:00
parent 20b40d3970 af44da916a
commit 9cf5064a3b
5 changed files with 22 additions and 3 deletions
--- a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
@@ -107,6 +107,10 @@ namespace chaiscript
      


+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+
      /**
       * Used by Proxy_Function_Impl to determine if it is equivalent to another
       * Proxy_Function_Impl object. This function is primarly used to prevent