Merge branch 'master' of https://github.com/ChaiScript/ChaiScript

2011-03-14 09:12:01 -06:00
parent f6b6936348 2ce55d81b3
commit e3feb05e05
12 changed files with 78 additions and 39 deletions
--- a/include/chaiscript/dispatchkit/bad_boxed_cast.hpp
+++ b/include/chaiscript/dispatchkit/bad_boxed_cast.hpp
@@ -21,8 +21,8 @@ namespace chaiscript
    {
      public:
        bad_boxed_cast(const Type_Info &t_from, const std::type_info &t_to,
-            const std::string &what)
-          : from(t_from), to(&t_to), m_what(what)
+            const std::string &t_what) throw()
+          : from(t_from), to(&t_to), m_what(t_what)
        {
        }

@@ -31,8 +31,8 @@ namespace chaiscript
        {
        }

-        bad_boxed_cast(const std::string &w) throw()
-          : m_what(w)
+        bad_boxed_cast(const std::string &t_what) throw()
+          : m_what(t_what)
        {
        }