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

Conflicts: include/chaiscript/dispatchkit/bad_boxed_cast.hpp
2012-06-01 08:50:15 -06:00
parent 2969f61fe4 7f253bd6c1
commit 8f7793a795
4 changed files with 17 additions and 12 deletions
--- a/include/chaiscript/dispatchkit/bad_boxed_cast.hpp
+++ b/include/chaiscript/dispatchkit/bad_boxed_cast.hpp
@@ -33,7 +33,7 @@ namespace chaiscript
        }

        bad_boxed_cast(const std::string &t_what) noexcept
-          : m_what(t_what)
+          : to(0), m_what(t_what)
        {
        }