svn commit: r1125061 - in /trafficserver/traffic/trunk/lib/ts: Map.h Vec.cc Vec.h

[zw...@apache.org]

Author: zwoop
Date: Thu May 19 19:13:27 2011
New Revision: 1125061

URL: http://svn.apache.org/viewvc?rev=1125061&view=rev
Log:
TS-778 Compile Fails on Solaris 10 (gcc)

Author: Igor Brezac
Review: leif

John: If you don't think it's appropriate to use ink_assert()
in this code, please feel free to revert as you like (but, we
need something fixed for this to compile on Solaris apparently).

Modified:
    trafficserver/traffic/trunk/lib/ts/Map.h
    trafficserver/traffic/trunk/lib/ts/Vec.cc
    trafficserver/traffic/trunk/lib/ts/Vec.h

Modified: trafficserver/traffic/trunk/lib/ts/Map.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/Map.h?rev=1125061&r1=1125060&r2=1125061&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/Map.h (original)
+++ trafficserver/traffic/trunk/lib/ts/Map.h Thu May 19 19:13:27 2011
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
+#include "ink_assert.h"
 #include "List.h"
 #include "Vec.h"
 
@@ -54,7 +54,7 @@ template <class K, class C> class MapEle
   C     value;
   bool operator==(MapElem &e) { return e.key == key; }
   operator uintptr_t(void) { return (uintptr_t)(uintptr_t)key; }
-  MapElem(uintptr_t x) { assert(!x); key = 0; }
+  MapElem(uintptr_t x) { ink_assert(!x); key = 0; }
   MapElem(K akey, C avalue) : key(akey), value(avalue) {}
   MapElem(MapElem &e) : key(e.key), value(e.value) {}
   MapElem() : key(0) {}

Modified: trafficserver/traffic/trunk/lib/ts/Vec.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/Vec.cc?rev=1125061&r1=1125060&r2=1125061&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/Vec.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/Vec.cc Thu May 19 19:13:27 2011
@@ -23,7 +23,6 @@
 /* UnionFind after Tarjan */
 
 #include <stdint.h>
-#include <assert.h>
 #include "Vec.h"
 
 uintptr_t prime2[] = {
@@ -72,7 +71,7 @@ uintptr_t open_hash_primes[256] = {
 // binary search over intervals
 static int
 i_find(Intervals *i, int x) {
-  assert(i->n);
+  ink_assert(i->n);
   int l = 0, h = i->n;
  Lrecurse:
   if (h <= l + 2) {
@@ -130,7 +129,7 @@ Intervals::insert(int x) {
     }
     goto Lmore;
   } else {
-    assert(x < v[l]);
+    ink_assert(x < v[l]);
     if (x == v[l] - 1) {
       v[l]--;
       goto Lmerge;

Modified: trafficserver/traffic/trunk/lib/ts/Vec.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/Vec.h?rev=1125061&r1=1125060&r2=1125061&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/Vec.h (original)
+++ trafficserver/traffic/trunk/lib/ts/Vec.h Thu May 19 19:13:27 2011
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include "defalloc.h"
+#include "ink_assert.h"
 
 // Simple Vector class, also supports open hashed sets
 
@@ -624,7 +625,7 @@ Vec<C,A,S>::addx() {
   if (v == e) {
     v = (C*)A::alloc(VEC_INITIAL_SIZE * sizeof(C));
     memcpy(v, &e[0], n * sizeof(C));
-    assert(n < VEC_INITIAL_SIZE);
+    ink_assert(n < VEC_INITIAL_SIZE);
     memset(&v[n], 0, (VEC_INITIAL_SIZE - n) * sizeof(C));
   } else {
     if ((n & (n-1)) == 0) {