memory.make_object() now allows not only Pointer instances

Objects on which you can call get_object_pointer() are allowed as well.

Removed a few redundant imports

Author: Ayuto

src/core/modules/memory/memory_function_info.h

@@ -315,7 +315,6 @@ template<> struct MFI_Impl<4*SH_PTRSIZE>   // THE BIGGEST ONE!!!1GABEN
 // ============================================================================
 #include "memory_signature.h"
 #include "memory_calling_convention.h"
-#include "memory_tools.h"
 
 #include "boost/python/signature.hpp"
 #include "boost/mpl/transform.hpp"

src/core/modules/memory/memory_hooks.cpp

@@ -28,7 +28,7 @@
 // >> INCLUDES
 // ============================================================================
 #include "memory_hooks.h"
-#include "memory_tools.h"
+#include "memory_pointer.h"
 #include "utilities/wrap_macros.h"
 #include "utilities/call_python.h"
 #include "utilities/sp_util.h"

src/core/modules/memory/memory_scanner.cpp

@@ -39,7 +39,6 @@
 #include "dynload.h"
 
 #include "memory_scanner.h"
-#include "memory_tools.h"
 #include "utilities/sp_util.h"
 #include "utilities/call_python.h"
 #include "sp_main.h"

src/core/modules/memory/memory_scanner.h

@@ -32,7 +32,7 @@
 //-----------------------------------------------------------------------------
 #include <list>
 #include "export_main.h"
-#include "memory_tools.h"
+#include "memory_pointer.h"
 
 struct Signature_t
 {

src/core/modules/memory/memory_tools.h

@@ -33,6 +33,8 @@
 #include "memory_pointer.h"
 #include "memory_utilities.h"
 
+CPointer* ExtractPointer(object oPtr);
+
 
 // ============================================================================
 // >> GetObjectPointer
@@ -49,15 +51,16 @@ inline object GetObjectPointer(object obj)
 // ============================================================================
 // >> MakeObject
 // ============================================================================
-inline object MakeObject(object cls, CPointer* pPtr)
+inline object MakeObject(object cls, object oPtr)
 {
 	if (!PyObject_HasAttrString(cls.ptr(), GET_OBJ_NAME))
 		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Unable to make an object using this class.");
 
+	CPointer* pPtr = ExtractPointer(oPtr);
 	if (!pPtr->IsValid())
 		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Pointer is NULL.");
 
-	return cls.attr(GET_OBJ_NAME)(ptr(pPtr));
+	return cls.attr(GET_OBJ_NAME)(pPtr);
 }