[Avida-SVN] r3466 - development/source/platform/tcmalloc

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2009-10-12 10:59:07 -0400 (Mon, 12 Oct 2009)
New Revision: 3466

Modified:
   development/source/platform/tcmalloc/tcmalloc.cc
Log:
Fix some debug mode sign comparison warnings in tcmalloc.

Modified: development/source/platform/tcmalloc/tcmalloc.cc
===================================================================
--- development/source/platform/tcmalloc/tcmalloc.cc	2009-10-12 14:55:44 UTC (rev 3465)
+++ development/source/platform/tcmalloc/tcmalloc.cc	2009-10-12 14:59:07 UTC (rev 3466)
@@ -438,7 +438,7 @@
 class PageHeapAllocator {
  private:
   // How much to allocate from system at a time
-  static const int kAllocIncrement = 128 << 10;
+  static const unsigned int kAllocIncrement = 128 << 10;
 
   // Aligned size of T
   static const size_t kAlignedSize
@@ -842,8 +842,8 @@
   span->free = 0;
   Event(span, 'A', n);
 
+  ASSERT(((int)span->length - 1) >= 0);
   const unsigned int extra = span->length - n;
-  ASSERT(extra >= 0);
   if (extra > 0) {
     Span* leftover = NewSpan(span->start + n, extra);
     leftover->free = 1;
@@ -1372,7 +1372,7 @@
     }
     race_counter = t;
   }
-  ASSERT(t >= 0);
+//  ASSERT(t >= 0);
   ASSERT(t < kNumClasses);
   if (t == locked_size_class) return false;
   return central_cache[t].ShrinkCache(locked_size_class, force);