Author: zwoop
Date: Fri Jan 6 05:12:40 2012
New Revision: 1227957
URL: http://svn.apache.org/viewvc?rev=1227957&view=rev
Log:
TS-992 I know we could do a static_cast/const_cast combo here, but wth, lets
just stick with the current code base, and get it to compile
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc
trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc
Modified: trafficserver/traffic/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1227957&r1=1227956&r2=1227957&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Fri Jan 6 05:12:40 2012
@@ -1,9 +1,12 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.2
+ *) [TS-1057] Expose Base64-encoding through APIs.
+ Author: Yakov Kopel and leif
+
*) [TS-1014] slow log can not print logs well on 32-bit system,
changed the %d to RPI64. Author: weijin.
- *) [TS-992] Add OpenBSD support. Author: Piotr Sikora
+ *) [TS-992] Various portability fixes. Author: Piotr Sikora
*) [TS-999] Deprecate TSUrlDestroy(), it's a no-op. Just make sure
to release the marshal buffers as normal.
Modified: trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc?rev=1227957&r1=1227956&r2=1227957&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc Fri Jan 6 05:12:40 2012
@@ -2642,7 +2642,7 @@ ConfigDate(char *datestr)
return CLI_ERROR;
}
- mPtr = localtime(const_cast<const time_t *>(&(v.tv_sec)));
+ mPtr = localtime((const time_t *)&(v.tv_sec));
mPtr->tm_mday = dd;
mPtr->tm_mon = mm - 1;
@@ -2726,7 +2726,7 @@ ConfigTime(char *timestr)
return CLI_ERROR;
}
- mPtr = localtime(const_cast<const time_t *>(&(v.tv_sec)));
+ mPtr = localtime((const time_t *)&(v.tv_sec));
mPtr->tm_sec = sec;
mPtr->tm_min = min;
Modified: trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc?rev=1227957&r1=1227956&r2=1227957&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc (original)
+++ trafficserver/traffic/trunk/mgmt/tools/SysAPI.cc Fri Jan 6 05:12:40 2012
@@ -648,7 +648,7 @@ Time_GetTime(char *hour, const size_t ho
if (status != 0) {
return status;
}
- my_tm = localtime(const_cast<const time_t *>(&(tv.tv_sec)));
+ my_tm = localtime((const time_t *)&(tv.tv_sec));
snprintf(hour, hourSize, "%d", my_tm->tm_hour);
snprintf(minute, minuteSize, "%d", my_tm->tm_min);
@@ -688,7 +688,7 @@ Time_GetDate(char *month, const size_t m
if (status != 0) {
return status;
}
- my_tm = localtime(const_cast<time_t *>(&(tv.tv_sec)));
+ my_tm = localtime((time_t *)&(tv.tv_sec));
snprintf(month, monthSize, "%d", my_tm->tm_mon + 1);
snprintf(day, daySize, "%d", my_tm->tm_mday);