Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts:
	include/chaiscript/dispatchkit/bootstrap.hpp
	include/chaiscript/dispatchkit/proxy_functions_detail.hpp
	src/reflection.cpp
This commit is contained in:
Jason Turner
2014-02-22 16:41:28 -07:00
5 changed files with 22 additions and 3 deletions

View File

@@ -275,7 +275,11 @@ namespace chaiscript
auto pf = std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_pf); auto pf = std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_pf);
if (pf) if (pf)
{ {
return bool(pf->get_guard()); if (pf->get_guard()) {
return true;
} else {
return false;
}
} else { } else {
return false; return false;
} }

View File

@@ -107,6 +107,10 @@ namespace chaiscript
#ifdef BOOST_MSVC
#pragma warning(pop)
#endif
/** /**
* Used by Proxy_Function_Impl to determine if it is equivalent to another * Used by Proxy_Function_Impl to determine if it is equivalent to another
* Proxy_Function_Impl object. This function is primarly used to prevent * Proxy_Function_Impl object. This function is primarly used to prevent

View File

@@ -67,8 +67,8 @@ std::string default_search_path()
return ""; return "";
} }
#else #else
std::string exepath; std::string exepath;
std::vector<char> buf(2048); std::vector<char> buf(2048);

View File

@@ -26,7 +26,12 @@ bool has_parse_tree(const chaiscript::Const_Proxy_Function &t_pf)
= std::dynamic_pointer_cast<const chaiscript::dispatch::Dynamic_Proxy_Function>(t_pf); = std::dynamic_pointer_cast<const chaiscript::dispatch::Dynamic_Proxy_Function>(t_pf);
if (pf) if (pf)
{ {
return bool(pf->get_parse_tree()); if (pf->get_parse_tree())
{
return true;
} else {
return false;
}
} else { } else {
return false; return false;
} }

View File

@@ -15,6 +15,9 @@ class TestBaseType
int val; int val;
const int const_val; const int const_val;
private:
TestBaseType &operator=(const TestBaseType &);
}; };
enum TestEnum enum TestEnum
@@ -32,6 +35,9 @@ class TestDerivedType : public TestBaseType
public: public:
virtual ~TestDerivedType() {} virtual ~TestDerivedType() {}
virtual int func() { return 1; } virtual int func() { return 1; }
private:
TestDerivedType &operator=(const TestDerivedType &);
}; };
std::string hello_world() std::string hello_world()