You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2010/02/02 23:26:36 UTC
svn commit: r905822 - in /incubator/trafficserver/traffic/trunk:
iocore/cluster/ClusterCache.cc proxy/CoreUtils.cc
proxy/dns_cache/DNS_cache.cc
Author: bcall
Date: Tue Feb 2 22:26:36 2010
New Revision: 905822
URL: http://svn.apache.org/viewvc?rev=905822&view=rev
Log:
TS-42 added a few more type casts to work with rhel4 64-bit
Modified:
incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc
incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc
incubator/trafficserver/traffic/trunk/proxy/dns_cache/DNS_cache.cc
Modified: incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc?rev=905822&r1=905821&r2=905822&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc Tue Feb 2 22:26:36 2010
@@ -2954,7 +2954,7 @@
CacheContinuation::callbackEvent(int event, Event * e)
{
if (!action.cancelled)
- action.continuation->handleEvent(result, (void *) result_error);
+ action.continuation->handleEvent(result, (void *)(intptr_t)result_error);
cacheContAllocator_free(this);
return EVENT_DONE;
}
Modified: incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc?rev=905822&r1=905821&r2=905822&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc Tue Feb 2 22:26:36 2010
@@ -890,7 +890,7 @@
swizzle_heap->m_read_write_heap.m_ptr = NULL;
// We'have one read-only string heap after marshalling
- swizzle_heap->m_ronly_heap[0].m_heap_start = (char *) swizzle_heap->m_size; // offset
+ swizzle_heap->m_ronly_heap[0].m_heap_start = (char *)(intptr_t)swizzle_heap->m_size; // offset
swizzle_heap->m_ronly_heap[0].m_ref_count_ptr.m_ptr = NULL;
swizzle_heap->m_ronly_heap[1].m_heap_start = NULL;
Modified: incubator/trafficserver/traffic/trunk/proxy/dns_cache/DNS_cache.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/dns_cache/DNS_cache.cc?rev=905822&r1=905821&r2=905822&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/dns_cache/DNS_cache.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/dns_cache/DNS_cache.cc Tue Feb 2 22:26:36 2010
@@ -416,7 +416,7 @@
if (dns_proxy_port == 0)
dns_proxy_port = DEFAULT_DNS_PROXY_PORT;
- ink_thread_create(dns_udp_receiver, (void *) dns_proxy_port);
+ ink_thread_create(dns_udp_receiver, (void *)(intptr_t)dns_proxy_port);
}
void *