summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--context.h4
-rw-r--r--include/pso/TObject.h4
-rw-r--r--src/pso/TObject.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/context.h b/context.h
index 9640c79..7da1dc5 100644
--- a/context.h
+++ b/context.h
@@ -1073,8 +1073,8 @@ public:
TObject(TObject *parent = NULL);
virtual ~TObject();
- void *operator new (size_t size) { return alloc(size); };
- void operator delete(void *ptr) { free(ptr); };
+ void *operator new (size_t size);
+ void operator delete(void *ptr);
void delete_children();
void queue_destruction_for_each_node();
diff --git a/include/pso/TObject.h b/include/pso/TObject.h
index 1478871..55e49ce 100644
--- a/include/pso/TObject.h
+++ b/include/pso/TObject.h
@@ -137,8 +137,8 @@ public:
TObject(TObject *parent = NULL);
virtual ~TObject();
- void *operator new (size_t size) { return alloc(size); };
- void operator delete(void *ptr) { free(ptr); };
+ void *operator new (size_t size);
+ void operator delete(void *ptr);
void delete_children();
void queue_destruction_for_each_node();
diff --git a/src/pso/TObject.cpp b/src/pso/TObject.cpp
index d065518..ed56035 100644
--- a/src/pso/TObject.cpp
+++ b/src/pso/TObject.cpp
@@ -32,11 +32,11 @@ bool TObject::toggle_flag_9_if_flag_10_is_clear() {
}
}
-void TObject::free(void *ptr) {
+void TObject::operator delete(void *ptr) {
obj_heap->heap_free(ptr);
}
-void *TObject::alloc(size_t size) {
+void *TObject::operator new(size_t size) {
return obj_heap->heap_alloc(size);
}