Memory leak error fixes. Various compiler fixes.

lefticus · lefticus · commit 9449fca22f52 · 2015-01-15T15:42:35.000-07:00
diff --git a/include/chaiscript/dispatchkit/bad_boxed_cast.hpp b/include/chaiscript/dispatchkit/bad_boxed_cast.hpp
@@ -46,7 +46,7 @@ namespace chaiscript
         }
 
         bad_boxed_cast(const bad_boxed_cast &) = default;
-        virtual ~bad_boxed_cast() CHAISCRIPT_NOEXCEPT = default;
+        virtual ~bad_boxed_cast() CHAISCRIPT_NOEXCEPT {}
 
         /// \brief Description of what error occurred
         virtual const char * what() const CHAISCRIPT_NOEXCEPT CHAISCRIPT_OVERRIDE
diff --git a/include/chaiscript/dispatchkit/proxy_functions.hpp b/include/chaiscript/dispatchkit/proxy_functions.hpp
@@ -224,7 +224,7 @@ namespace chaiscript
         {
         }
 
-        virtual ~Dynamic_Proxy_Function() = default;
+        virtual ~Dynamic_Proxy_Function() {}
 
         virtual bool operator==(const Proxy_Function_Base &rhs) const CHAISCRIPT_OVERRIDE
         {
@@ -591,7 +591,7 @@ namespace chaiscript
         }
 
         dispatch_error(const dispatch_error &) = default;
-        virtual ~dispatch_error() CHAISCRIPT_NOEXCEPT = default;
+        virtual ~dispatch_error() CHAISCRIPT_NOEXCEPT {}
 
         std::vector<Boxed_Value> parameters;
         std::vector<Const_Proxy_Function> functions;
diff --git a/include/chaiscript/dispatchkit/type_conversions.hpp b/include/chaiscript/dispatchkit/type_conversions.hpp
@@ -46,7 +46,7 @@ namespace chaiscript
 
         bad_boxed_dynamic_cast(const bad_boxed_dynamic_cast &) = default;
 
-        virtual ~bad_boxed_dynamic_cast() CHAISCRIPT_NOEXCEPT = default;
+        virtual ~bad_boxed_dynamic_cast() CHAISCRIPT_NOEXCEPT {}
     };
 
     class bad_boxed_type_cast : public bad_boxed_cast
@@ -70,7 +70,7 @@ namespace chaiscript
 
         bad_boxed_type_cast(const bad_boxed_type_cast &) = default;
 
-        virtual ~bad_boxed_type_cast() CHAISCRIPT_NOEXCEPT = default;
+        virtual ~bad_boxed_type_cast() CHAISCRIPT_NOEXCEPT {}
     };
   }
 
diff --git a/include/chaiscript/language/chaiscript_common.hpp b/include/chaiscript/language/chaiscript_common.hpp
@@ -398,7 +398,7 @@ namespace chaiscript
       { }
 
       file_not_found_error(const file_not_found_error &) = default;
-      virtual ~file_not_found_error() CHAISCRIPT_NOEXCEPT = default;
+      virtual ~file_not_found_error() CHAISCRIPT_NOEXCEPT {}
     };
 
   }
diff --git a/include/chaiscript/language/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp
@@ -62,7 +62,7 @@ namespace chaiscript
       }
 
       load_module_error(const load_module_error &) = default;
-      virtual ~load_module_error() CHAISCRIPT_NOEXCEPT = default;
+      virtual ~load_module_error() CHAISCRIPT_NOEXCEPT {}
     };
   }
 
diff --git a/src/test_module.cpp b/src/test_module.cpp
@@ -9,7 +9,7 @@ class TestBaseType
   public:
     TestBaseType() : val(10), const_val(15) { }
     TestBaseType(int) : val(10), const_val(15) {}
-    TestBaseType(int *) : val(10), const_val(15) {}
+    TestBaseType(int *i) : val(10), const_val(15) { }
     TestBaseType(const TestBaseType &) = default;
     virtual ~TestBaseType() {}
     virtual int func() { return 0; }
@@ -100,9 +100,11 @@ std::string hello_world()
   return "Hello World";
 }
 
+int global_i = 1;
+
 int *get_new_int()
 {
-  return new int(1);
+  return &global_i;
 }
 
 // MSVC doesn't like that we are using C++ return types from our C declared module
diff --git a/unittests/boxed_cast_test.cpp b/unittests/boxed_cast_test.cpp
@@ -265,20 +265,25 @@ bool pointer_test(const T& default_value, const T& new_value)
 
     if (p != (*result) ) { 
       std::cerr << "Pointer passed in different than one returned\n";
+      delete p;
       return false;
     }
 
     if (*p != *(*result) ) {
       std::cerr << "Somehow dereferenced pointer values are not the same?\n";
+      delete p;
       return false;
     }
 
+    delete p;
     return true;
   } catch (const exception::bad_boxed_cast &) {
     std::cerr << "Bad boxed cast performing ** to ** test\n";
+    delete p;
     return false;
   } catch (...) {
     std::cerr << "Unknown exception performing ** to ** test\n";
+    delete p;
     return false;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ namespace chaiscript`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`bad_boxed_cast(const bad_boxed_cast &) = default;`
`49`		`- virtual ~bad_boxed_cast() CHAISCRIPT_NOEXCEPT = default;`
	`49`	`+ virtual ~bad_boxed_cast() CHAISCRIPT_NOEXCEPT {}`
`50`	`50`
`51`	`51`	`/// \brief Description of what error occurred`
`52`	`52`	`virtual const char * what() const CHAISCRIPT_NOEXCEPT CHAISCRIPT_OVERRIDE`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ namespace chaiscript`
`224`	`224`	`{`
`225`	`225`	`}`
`226`	`226`
`227`		`- virtual ~Dynamic_Proxy_Function() = default;`
	`227`	`+ virtual ~Dynamic_Proxy_Function() {}`
`228`	`228`
`229`	`229`	`virtual bool operator==(const Proxy_Function_Base &rhs) const CHAISCRIPT_OVERRIDE`
`230`	`230`	`{`
`@@ -591,7 +591,7 @@ namespace chaiscript`
`591`	`591`	`}`
`592`	`592`
`593`	`593`	`dispatch_error(const dispatch_error &) = default;`
`594`		`- virtual ~dispatch_error() CHAISCRIPT_NOEXCEPT = default;`
	`594`	`+ virtual ~dispatch_error() CHAISCRIPT_NOEXCEPT {}`
`595`	`595`
`596`	`596`	`std::vector<Boxed_Value> parameters;`
`597`	`597`	`std::vector<Const_Proxy_Function> functions;`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ namespace chaiscript`
`398`	`398`	`{ }`
`399`	`399`
`400`	`400`	`file_not_found_error(const file_not_found_error &) = default;`
`401`		`- virtual ~file_not_found_error() CHAISCRIPT_NOEXCEPT = default;`
	`401`	`+ virtual ~file_not_found_error() CHAISCRIPT_NOEXCEPT {}`
`402`	`402`	`};`
`403`	`403`
`404`	`404`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ namespace chaiscript`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`load_module_error(const load_module_error &) = default;`
`65`		`- virtual ~load_module_error() CHAISCRIPT_NOEXCEPT = default;`
	`65`	`+ virtual ~load_module_error() CHAISCRIPT_NOEXCEPT {}`
`66`	`66`	`};`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class TestBaseType`
`9`	`9`	`public:`
`10`	`10`	`TestBaseType() : val(10), const_val(15) { }`
`11`	`11`	`TestBaseType(int) : val(10), const_val(15) {}`
`12`		`- TestBaseType(int *) : val(10), const_val(15) {}`
	`12`	`+ TestBaseType(int *i) : val(10), const_val(15) { }`
`13`	`13`	`TestBaseType(const TestBaseType &) = default;`
`14`	`14`	`virtual ~TestBaseType() {}`
`15`	`15`	`virtual int func() { return 0; }`
`@@ -100,9 +100,11 @@ std::string hello_world()`
`100`	`100`	`return "Hello World";`
`101`	`101`	`}`
`102`	`102`
	`103`	`+int global_i = 1;`
	`104`	`+`
`103`	`105`	`int *get_new_int()`
`104`	`106`	`{`
`105`		`- return new int(1);`
	`107`	`+ return &global_i;`
`106`	`108`	`}`
`107`	`109`
`108`	`110`	`// MSVC doesn't like that we are using C++ return types from our C declared module`