[10874] Update ACE to v5.8.3

(based on zergtmn's repo commit 3a8c259)
(based on zergtmn's repo commit 946c1a8)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
zerg 2010-12-14 17:14:34 +03:00 committed by VladimirMangos
parent c38c876b1d
commit b8d773091a
343 changed files with 3060 additions and 7431 deletions

View file

@ -1,4 +1,4 @@
// $Id: Ping_Socket.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
// $Id: Ping_Socket.cpp 92069 2010-09-28 11:38:59Z johnnyw $
#include "ace/Ping_Socket.h"
@ -212,13 +212,9 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len)
// Warning... using knowledge of IP header layout. This avoids a maze of
// #if blocks for various systems. The first byte of the header has the
// IP version in the left-most 4 bits and the length in the other 4 bits.
#if 0
hlen1 = ip->ip_hl; // length of IP header
#else
hlen1 = static_cast<unsigned char>(*ptr);
hlen1 <<= 4; // Bump the version off
hlen1 >>= 4; // Zero-extended length remains
#endif
hlen1 <<= 2; // Now it counts bytes, not words
icmp = (struct icmp *) (ptr + hlen1); // start of ICMP header