ChaiScript
diff --git a/‎include/chaiscript/dispatchkit/boxed_cast_helper.hpp
Lines changed: 14 additions & 3 deletions b/‎include/chaiscript/dispatchkit/boxed_cast_helper.hpp
Lines changed: 14 additions & 3 deletions
diff --git a/‎unittests/boxed_cast_test.cpp
Lines changed: 2 additions & 2 deletions b/‎unittests/boxed_cast_test.cpp
Lines changed: 2 additions & 2 deletions
@@ -62,7 +62,7 @@ namespace chaiscript
         {
           if (ob.get_type_info().bare_equal_type_info(typeid(Result)))
           {
-            return static_cast<const Result *>(throw_if_null(ob.get_const_ptr()));
+            return static_cast<const Result *>(ob.get_const_ptr());
           } else {
             throw chaiscript::detail::exception::bad_any_cast();
           }
@@ -76,15 +76,26 @@ namespace chaiscript
         typedef Result * Result_Type;
         static Result_Type cast(const Boxed_Value &ob, const Type_Conversions *)
         {
-          if (!ob.get_type_info().is_const() && ob.get_type_info() == typeid(Result))
+          if (!ob.get_type_info().is_const() && ob.get_type_info().bare_equal_type_info(typeid(Result)))
           {
-            return static_cast<Result *>(throw_if_null(ob.get_ptr()));
+            return static_cast<Result *>(ob.get_ptr());
           } else {
             throw chaiscript::detail::exception::bad_any_cast();
           }
         }
       };
 
+    template<typename Result>
+    struct Cast_Helper_Inner<Result * const &> : public Cast_Helper_Inner<Result *>
+    {
+    };
+
+    template<typename Result>
+    struct Cast_Helper_Inner<const Result * const &> : public Cast_Helper_Inner<const Result *>
+    {
+    };
+
+
     /// Cast_Helper_Inner for casting to a & type
     template<typename Result>
       struct Cast_Helper_Inner<const Result &>
 
@@ -13,9 +13,9 @@ bool run_test_type_conversion(const Boxed_Value &bv, bool expectedpass)
   try {
     To ret = chaiscript::boxed_cast<To>(bv);
     use(ret);
-  } catch (const chaiscript::exception::bad_boxed_cast &/*e*/) {
+  } catch (const chaiscript::exception::bad_boxed_cast &e) {
     if (expectedpass) {
-//      std::cerr << "Failure in run_test_type_conversion: " << e.what() << '\n';
+      std::cerr << "Failure in run_test_type_conversion: " << e.what() << '\n';
       return false;
     } else {
       return true;
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ namespace chaiscript`
`62`	`62`	`{`
`63`	`63`	`if (ob.get_type_info().bare_equal_type_info(typeid(Result)))`
`64`	`64`	`{`
`65`		`- return static_cast<const Result *>(throw_if_null(ob.get_const_ptr()));`
	`65`	`+ return static_cast<const Result *>(ob.get_const_ptr());`
`66`	`66`	`} else {`
`67`	`67`	`throw chaiscript::detail::exception::bad_any_cast();`
`68`	`68`	`}`
`@@ -76,15 +76,26 @@ namespace chaiscript`
`76`	`76`	`typedef Result * Result_Type;`
`77`	`77`	`static Result_Type cast(const Boxed_Value &ob, const Type_Conversions *)`
`78`	`78`	`{`
`79`		`- if (!ob.get_type_info().is_const() && ob.get_type_info() == typeid(Result))`
	`79`	`+ if (!ob.get_type_info().is_const() && ob.get_type_info().bare_equal_type_info(typeid(Result)))`
`80`	`80`	`{`
`81`		`- return static_cast<Result *>(throw_if_null(ob.get_ptr()));`
	`81`	`+ return static_cast<Result *>(ob.get_ptr());`
`82`	`82`	`} else {`
`83`	`83`	`throw chaiscript::detail::exception::bad_any_cast();`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`};`
`87`	`87`
	`88`	`+ template<typename Result>`
	`89`	`+ struct Cast_Helper_Inner<Result * const &> : public Cast_Helper_Inner<Result *>`
	`90`	`+ {`
	`91`	`+ };`
	`92`	`+`
	`93`	`+ template<typename Result>`
	`94`	`+ struct Cast_Helper_Inner<const Result * const &> : public Cast_Helper_Inner<const Result *>`
	`95`	`+ {`
	`96`	`+ };`
	`97`	`+`
	`98`	`+`
`88`	`99`	`/// Cast_Helper_Inner for casting to a & type`
`89`	`100`	`template<typename Result>`
`90`	`101`	`struct Cast_Helper_Inner<const Result &>`