Merge branch 'master' into ChaiScript_5_0_CPP_11

lefticus · lefticus · commit 9cf5064a3bfa · 2014-02-22T16:41:28.000-07:00
Conflicts:
	include/chaiscript/dispatchkit/bootstrap.hpp
	include/chaiscript/dispatchkit/proxy_functions_detail.hpp
	src/reflection.cpp
diff --git a/include/chaiscript/dispatchkit/bootstrap.hpp b/include/chaiscript/dispatchkit/bootstrap.hpp
@@ -275,7 +275,11 @@ namespace chaiscript
         auto pf = std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_pf);
         if (pf)
         {
-          return bool(pf->get_guard());
+          if (pf->get_guard()) {
+            return true;
+          } else {
+            return false;
+          }
         } else {
           return false;
         }
diff --git a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
@@ -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
        * Proxy_Function_Impl object. This function is primarly used to prevent
diff --git a/src/main.cpp b/src/main.cpp
@@ -67,8 +67,8 @@ std::string default_search_path()
     return "";
   }
 
-
 #else
+
   std::string exepath;
 
   std::vector<char> buf(2048);
diff --git a/src/reflection.cpp b/src/reflection.cpp
@@ -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);
   if (pf)
   {
-    return bool(pf->get_parse_tree());
+    if (pf->get_parse_tree())
+    {
+      return true;
+    } else {
+      return false;
+    }
   } else {
     return false;
   }
diff --git a/src/test_module.cpp b/src/test_module.cpp
@@ -15,6 +15,9 @@ class TestBaseType
 
     int val;
     const int const_val;
+
+  private:
+    TestBaseType &operator=(const TestBaseType &);
 };
 
 enum TestEnum
@@ -32,6 +35,9 @@ class TestDerivedType : public TestBaseType
   public:
     virtual ~TestDerivedType() {}
     virtual int func() { return 1; }
+
+  private:
+    TestDerivedType &operator=(const TestDerivedType &);
 };
 
 std::string hello_world()

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,11 @@ namespace chaiscript`
`275`	`275`	`auto pf = std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_pf);`
`276`	`276`	`if (pf)`
`277`	`277`	`{`
`278`		`- return bool(pf->get_guard());`
	`278`	`+ if (pf->get_guard()) {`
	`279`	`+ return true;`
	`280`	`+ } else {`
	`281`	`+ return false;`
	`282`	`+ }`
`279`	`283`	`} else {`
`280`	`284`	`return false;`
`281`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,8 @@ std::string default_search_path()`
`67`	`67`	`return "";`
`68`	`68`	`}`
`69`	`69`
`70`		`-`
`71`	`70`	`#else`
	`71`	`+`
`72`	`72`	`std::string exepath;`
`73`	`73`
`74`	`74`	`std::vector<char> buf(2048);`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,12 @@ bool has_parse_tree(const chaiscript::Const_Proxy_Function &t_pf)`
`26`	`26`	`= std::dynamic_pointer_cast<const chaiscript::dispatch::Dynamic_Proxy_Function>(t_pf);`
`27`	`27`	`if (pf)`
`28`	`28`	`{`
`29`		`- return bool(pf->get_parse_tree());`
	`29`	`+ if (pf->get_parse_tree())`
	`30`	`+ {`
	`31`	`+ return true;`
	`32`	`+ } else {`
	`33`	`+ return false;`
	`34`	`+ }`
`30`	`35`	`} else {`
`31`	`36`	`return false;`
`32`	`37`	`}`