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/proxy_functions_detail.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
@@ -7,10 +7,8 @@
 #ifndef CHAISCRIPT_PROXY_FUNCTIONS_DETAIL_HPP_
 #define CHAISCRIPT_PROXY_FUNCTIONS_DETAIL_HPP_

-#include <algorithm>
 #include <functional>
 #include <stdexcept>
-#include <string>
 #include <vector>

 #include "../chaiscript_defines.hpp"