Removed CCallback::Free. Now, dealloc() can be used to free the callback

Author: Ayuto

src/core/modules/memory/memory_callback.cpp

@@ -147,14 +147,17 @@ Param_t* CCallback::GetArgument(int iIndex)
     return temp;
 }
 
-void CCallback::Free()
+void CCallback::Dealloc()
 {
-    // TODO: Figure out how to use std::free() on the generated code, so we can
-	// use Dealloc().
     MemoryManager::getGlobal()->free((void *) m_ulAddr);
     m_ulAddr = 0;
 }
 
+void CCallback::Realloc(int iSize)
+{
+	BOOST_RAISE_EXCEPTION(PyExc_NotImplementedError, "This function is not implemented for callbacks.")
+}
+
 
 // ============================================================================
 // >> FUNCTIONS

src/core/modules/memory/memory_callback.h

@@ -73,7 +73,9 @@ class CCallback: public CFunction
     int      GetPopSize();
     int      GetArgumentCount();
     Param_t* GetArgument(int iIndex);
-    void     Free();
+
+	virtual void Dealloc();
+	virtual void Realloc(int iSize);
 
 public:
     // For variadic functions

src/core/modules/memory/memory_tools.h

@@ -189,8 +189,8 @@ class CPointer
 
 	CPointer*           GetVirtualFunc(int iIndex);
 
-	void                Realloc(int iSize) { m_ulAddr = (unsigned long) UTIL_Realloc((void *) m_ulAddr, iSize); }
-	void                Dealloc() { UTIL_Dealloc((void *) m_ulAddr); m_ulAddr = 0; }
+	virtual void        Realloc(int iSize) { m_ulAddr = (unsigned long) UTIL_Realloc((void *) m_ulAddr, iSize); }
+	virtual void        Dealloc() { UTIL_Dealloc((void *) m_ulAddr); m_ulAddr = 0; }
 
 	CFunction*          MakeFunction(Convention_t eConv, char* szParams);
 	CFunction*          MakeVirtualFunction(int iIndex, Convention_t eConv, char* szParams);

src/core/modules/memory/memory_wrap_python.cpp

@@ -457,11 +457,6 @@ void export_dynamichooks()
 void export_callbacks()
 {
     class_< CCallback, bases< CFunction > >("Callback", init< object, Convention_t, char * >())
-        .def("free",
-            &CCallback::Free,
-            "Frees the callback. Don't use dealloc()!"
-        )
-
         .def_readwrite("callback",
             &CCallback::m_oCallback,
             "The Python function that gets called by the C++ callback"