You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ge...@apache.org on 2010/01/24 01:58:40 UTC
svn commit: r902517 - in
/incubator/trafficserver/traffic/branches/dev/proxy: RegressionSM.cc
RegressionSM.h
Author: georgep
Date: Sun Jan 24 00:58:39 2010
New Revision: 902517
URL: http://svn.apache.org/viewvc?rev=902517&view=rev
Log:
TS-115: fix compilation issues on OSX(10.5,gcc-4.2.4)
Modified:
incubator/trafficserver/traffic/branches/dev/proxy/RegressionSM.cc
incubator/trafficserver/traffic/branches/dev/proxy/RegressionSM.h
Modified: incubator/trafficserver/traffic/branches/dev/proxy/RegressionSM.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/RegressionSM.cc?rev=902517&r1=902516&r2=902517&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/RegressionSM.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/RegressionSM.cc Sun Jan 24 00:58:39 2010
@@ -170,9 +170,9 @@
x = children[ichild];
else {
if (ichild != n-1)
- x = children[0]->clone();
+ x = children[(intptr_t)0]->clone();
else
- x = children[0];
+ x = children[(intptr_t)0];
}
x->xrun(this);
if (!par && nwaiting)
@@ -208,7 +208,7 @@
parent = &o;
nwaiting = o.nwaiting;
nchildren = o.nchildren;
- for (int i = 0; i < nchildren; i++)
+ for (intptr_t i = 0; i < nchildren; i++)
children(i) = o.children[i]->clone();
n = o.n;
ichild = o.ichild;
Modified: incubator/trafficserver/traffic/branches/dev/proxy/RegressionSM.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/RegressionSM.h?rev=902517&r1=902516&r2=902517&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/RegressionSM.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/RegressionSM.h Sun Jan 24 00:58:39 2010
@@ -55,7 +55,7 @@
int nwaiting;
int nchildren;
DynArray<RegressionSM*> children;
- int n, ichild;
+ intptr_t n, ichild;
bool par, rep;
Action *pending_action;