Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -4,6 +4,8 @@
/**
* @file MEM_IO.h
*
* $Id: MEM_IO.h 80826 2008-03-04 14:51:23Z wotte $
*
* @author Nanbor Wang <nanbor@cs.wustl.edu>
*/
//=============================================================================
@ -116,8 +118,6 @@ public:
const ACE_TCHAR *name,
MALLOC_OPTIONS *options);
int fini ();
/**
* Fetch location of next available data into <recv_buffer_>.
* As this operation read the address of the data off the socket