Changeset e03d7b in git

Timestamp:

Apr 10, 2015, 2:26:57 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

aeb760bbbad0ff816c36fdb5a66d5481d76a769c

Parents:

76f52597f7be2cdc6a83d6956f788e3bb342a2f9

Message:

opt: omallocClass mostly inlined

Location:

omalloc

Files:

• omallocClass.cc (modified) (2 diffs)
• omallocClass.h (modified) (2 diffs)

omalloc/omallocClass.cc

@@ -13 +13 @@
 #include <stdlib.h>
 #include <omalloc/omallocClass.h>
-
-/* We define those, so that our values of
-   OM_TRACK and OM_CHECK are used  */
-void* omallocClass::operator new ( size_t size )
-#ifndef __GNUC__
-throw (std::bad_alloc)
-#endif
-{
-  void* addr;
-  if (size==(size_t)0) size = 1;
-  omTypeAlloc(void*, addr, size);
-  return addr;
-}
-
-void  omallocClass::operator delete ( void* block )
-#ifndef __GNUC__
-throw ()
-#endif
-{
-  omfree( block );
-}
 
 void*  omallocClass::operator new[] ( size_t size )
@@ -76 +55 @@
 {
   void* addr;
-  if (size==(size_t)0) size = (size_t)1;
   omTypeAlloc(void*, addr, size);
   return addr;

omalloc/omallocClass.h

@@ -13 +13 @@
 #include <new>
 #include <stdlib.h>
+#include <omalloc/omalloc.h>
 
 class omallocClass
@@ -23 +24 @@
 throw (std::bad_alloc)
 #endif
-;
+{
+  void* addr;
+  omTypeAlloc(void*, addr, size);
+  return addr;
+}
+
 void operator delete ( void* block )
 #ifndef __GNUC__
 throw ()
 #endif
-;
+{
+  omFree( block );
+}
+
 
 void* operator new[] ( size_t size )