Changeset a28549 in git for omalloc/omInline.h

Timestamp:

Apr 28, 2006, 5:17:26 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

521be7bb9621d5c752e9948ebdafd9fdd8ad38be

Parents:

20722e405aa8f76d1fde4dd5a2a01cbcfb1e09bc

Message:

*hannes: 64bit stuff


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

File:

• omalloc/omInline.h (modified) (9 diffs)

omalloc/omInline.h

@@ -5 +5 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omInline.h,v 1.8 2001-04-30 09:02:07 Singular Exp $
+ *  Version: $Id: omInline.h,v 1.9 2006-04-28 15:17:26 Singular Exp $
  *******************************************************************/
 #if defined(OM_INLINE) || defined(OM_ALLOC_C)
@@ -34 +34 @@
   {
     unsigned long shift = omGetPageShiftOfAddr(addr);
-    return ((om_BinPageIndicies[index - om_MinBinPageIndex] & (((unsigned long) 1) << shift)) != 0);
+    return ((om_BinPageIndicies[index - om_MinBinPageIndex] & (((unsigned long) 1) << shift)) != 0L);
   }
   return 0;
@@ -154 +154 @@
 {
   void* r;
-  size_t i=0;
+  size_t i=(size_t)0;
 
   while (s[i]) i++;
@@ -184 +184 @@
 {
   void* addr;
-  if (! size) size = 1;
+  if (! size) size = (size_t)1;
   __omTypeAllocAligned(void*, addr,size);
   return addr;
@@ -192 +192 @@
 {
   void* addr;
-  if (! size) size = 1;
+  if (! size) size = (size_t)1;
   __omTypeAlloc0Aligned(void*,addr, size);
   return addr;
@@ -201 +201 @@
   void* new_addr;
 
-  if (!new_size) new_size = 1;
+  if (!new_size) new_size = (size_t)1;
   if (addr != NULL)
   {
@@ -217 +217 @@
   void* new_addr;
 
-  if (!new_size) new_size = 1;
-  if (addr != NULL && old_size > 0)
+  if (!new_size) new_size = (size_t)1;
+  if (addr != NULL && old_size > ((size_t)0))
   {
     __omTypeRealloc0AlignedSize(addr, old_size, void* , new_addr, new_size);
@@ -233 +233 @@
   void* new_addr;
 
-  if (!size) size = 1;
+  if (!size) size = (size_t)1;
   if (addr != NULL)
   {
@@ -249 +249 @@
   void* new_addr;
 
-  if (!size) size = 1;
+  if (!size) size = (size_t)1;
   if (addr != NULL)
   {