Merge branch 'develop' into smaller_make_shared

And also apply cleanups suggested from resharper Conflicts: include/chaiscript/language/chaiscript_parser.hpp
2015-04-27 11:55:12 -06:00
parent 7a13b6b801 8889324b2d
commit 986699a3fe
26 changed files with 168 additions and 242 deletions
--- a/include/chaiscript/dispatchkit/register_function.hpp
+++ b/include/chaiscript/dispatchkit/register_function.hpp
@@ -11,7 +11,6 @@
 #include <type_traits>

 #include "bind_first.hpp"
-#include "dispatchkit.hpp"
 #include "proxy_functions.hpp"

 namespace chaiscript