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 Thread_Adapter.h
*
* $Id: Thread_Adapter.h 92682 2010-11-23 23:41:19Z shuston $
*
* @author Carlos O'Ryan <coryan@uci.edu>
*/
//=============================================================================
@ -67,8 +69,6 @@ public:
/// Accessor for the optional ACE_Thread_Manager.
ACE_Thread_Manager *thr_mgr (void);
ACE_ALLOC_HOOK_DECLARE;
protected:
/// Ensure that this object must be allocated on the heap.
~ACE_Thread_Adapter (void);