svn commit: r1042909 - in /trafficserver/traffic/trunk: .gitignore lib/ts/test_atomic.cc

[zw...@apache.org]

Author: zwoop
Date: Tue Dec  7 04:34:47 2010
New Revision: 1042909

URL: http://svn.apache.org/viewvc?rev=1042909&view=rev
Log:
TS-586 Fix make check so it actually compiles

Modified:
    trafficserver/traffic/trunk/.gitignore
    trafficserver/traffic/trunk/lib/ts/test_atomic.cc

Modified: trafficserver/traffic/trunk/.gitignore
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/.gitignore?rev=1042909&r1=1042908&r2=1042909&view=diff
==============================================================================
--- trafficserver/traffic/trunk/.gitignore (original)
+++ trafficserver/traffic/trunk/.gitignore Tue Dec  7 04:34:47 2010
@@ -41,6 +41,10 @@ lib/ts/ParseRulesCType
 lib/ts/ParseRulesCTypeToLower
 lib/ts/ParseRulesCTypeToUpper
 lib/ts/mkdfa
+lib/ts/test_List
+lib/ts/test_arena
+lib/ts/test_atomic
+lib/ts/test_freelist
 proxy/config/records.config
 proxy/config/storage.config
 

Modified: trafficserver/traffic/trunk/lib/ts/test_atomic.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/test_atomic.cc?rev=1042909&r1=1042908&r2=1042909&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/test_atomic.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/test_atomic.cc Tue Dec  7 04:34:47 2010
@@ -163,7 +163,8 @@ main(int argc, const char *argv[])
 #ifndef LONG_ATOMICLIST_TEST
   int32 m = 1, n = 100;
   //int64 lm = 1LL, ln = 100LL;
-  char *m2 = "hello", *n2;
+  const char* m2 = "hello";
+  char* n2;
 
   printf("sizeof(int32)==%d   sizeof(void *)==%d\n", (int)sizeof(int32), (int)sizeof(void *));
 
@@ -177,11 +178,11 @@ main(int argc, const char *argv[])
   printf("changed to: %d,  result=%s\n", m, n ? "true" : "false");
 
   printf("CAS pointer: '%s' == 'hello'  then  'new'\n", m2);
-  n = ink_atomic_cas_ptr((pvvoidp) & m2, (char *) "hello", (char *) "new");
+  n = ink_atomic_cas_ptr((pvvoidp) &m2, (char *) "hello", (char *) "new");
   printf("changed to: %s, result=%s\n", m2, n ? (char *) "true" : (char *) "false");
 
   printf("CAS pointer: '%s' == 'hello'  then  'new2'\n", m2);
-  n = ink_atomic_cas_ptr((pvvoidp) & m2, m2, (char *) "new2");
+  n = ink_atomic_cas_ptr((pvvoidp)&m2, (char*)m2, (char *) "new2");
   printf("changed to: %s, result=%s\n", m2, n ? "true" : "false");
 
   n = 100;
@@ -191,7 +192,7 @@ main(int argc, const char *argv[])
 
 
   printf("Atomic Fetch-and-Add 2 to pointer to '%s'\n", m2);
-  n2 = (char *) ink_atomic_increment_ptr((pvvoidp) & m2, 2);
+  n2 = (char *)ink_atomic_increment_ptr((pvvoidp)&m2, 2);
   printf("changed to: %s,  result=%s\n", m2, n2);
 
   printf("Testing atomic lists\n");