summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/pso/TObject.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/pso/TObject.h b/include/pso/TObject.h
index b224225..8d3e6e8 100644
--- a/include/pso/TObject.h
+++ b/include/pso/TObject.h
@@ -34,6 +34,7 @@ enum object_flags {
BIT_15 = 0x8000,
ALL_BITS = 0xFFFF
};
+
static inline object_flags operator^(object_flags a, object_flags b) { return static_cast<object_flags>(static_cast<u16>(a) ^ static_cast<u16>(b)); };
static inline object_flags operator&(object_flags a, object_flags b) { return static_cast<object_flags>(static_cast<u16>(a) & static_cast<u16>(b)); };
static inline object_flags operator|(object_flags a, object_flags b) { return static_cast<object_flags>(static_cast<u16>(a) | static_cast<u16>(b)); };
@@ -89,7 +90,7 @@ public:
void log(const char *str);
int get_node_count();
bool all_parents_unqueued_for_destruction();
- static void *alloc(unsigned long size);
+ static void *alloc(size_t size);
static void free(void *ptr);
bool toggle_flag_9_if_flag_10_is_clear();