Merge branch 'develop' of github.com:ChaiScript/ChaiScript into develop

2015-04-27 16:19:41 -06:00
parent dbe546fefb 8889324b2d
commit 86ec14c2c8
12 changed files with 83 additions and 116 deletions
--- a/include/chaiscript/language/chaiscript_eval.hpp
+++ b/include/chaiscript/language/chaiscript_eval.hpp
@@ -1312,7 +1312,7 @@ namespace chaiscript
            end_point = this->children.size() - 1;
          }
          for (size_t i = 1; i < end_point; ++i) {
-            chaiscript::eval::detail::Scope_Push_Pop catchscope(t_ss);
+            chaiscript::eval::detail::Scope_Push_Pop catch_scope(t_ss);
            AST_NodePtr catch_block = this->children[i];

            if (catch_block->children.size() == 1) {