Changeset 64673d in git

Timestamp:

Oct 28, 2008, 10:12:40 AM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

43058fdc6903d63e4a46d55dea3261b951df7018

Parents:

3425c28defd1e45c8aacb598a943c2dfd616390f

Message:

*hannes: re-ordered


git-svn-id: file:///usr/local/Singular/svn/trunk@11162 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/mmalloc.cc (modified) (4 diffs)

kernel/mmalloc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmalloc.cc,v 1.6 2008-10-25 11:05:51 Singular Exp $ */
+/* $Id: mmalloc.cc,v 1.7 2008-10-28 09:12:40 Singular Exp $ */
 /*
 * ABSTRACT: standard version of C++-memory management alloc func
@@ -18 +18 @@
 {
   void* addr;
-  if (!size) size = 1;
+  if (size==(size_t)0) size = 1;
   omTypeAlloc(void*, addr, size);
   return addr;
+}
+
+void operator delete ( void* block )
+{
+  omfree( block );
+}
+
+void* operator new[] ( size_t size )
+{
+  void* addr;
+  if (size==(size_t)0) size = (size_t)1;
+  omTypeAlloc(void*, addr, size);
+  return addr;
+}
+
+void operator delete[] ( void* block )
+{
+  omfree( block );
 }
 
@@ -50 +68 @@
 }
 
-void operator delete ( void* block )
-{
-  omfree( block );
-}
-
-void* operator new[] ( size_t size )
-{
-  void* addr;
-  if (size==(size_t)0) size = (size_t)1;
-  omTypeAlloc(void*, addr, size);
-  return addr;
-}
-
 void * operator new[](size_t size, const std::nothrow_t &) throw()
 {
@@ -70 +75 @@
   return addr;
 }
-
-
-void operator delete[] ( void* block )
-{
-  omfree( block );
-}