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

Conflicts:
	include/chaiscript/dispatchkit/bad_boxed_cast.hpp
This commit is contained in:
Jason Turner
2012-06-01 08:50:15 -06:00
4 changed files with 17 additions and 12 deletions

View File

@@ -45,6 +45,7 @@ namespace chaiscript
{
public:
virtual Boxed_Value convert(const Boxed_Value &derived) = 0;
const Type_Info &base()
{
return m_base;
@@ -60,6 +61,8 @@ namespace chaiscript
{
}
virtual ~Dynamic_Conversion() {}
private:
Type_Info m_base;
Type_Info m_derived;