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 Static_Object_Lock.h
*
* $Id: Static_Object_Lock.h 80826 2008-03-04 14:51:23Z wotte $
*
* @author David L. Levine <levine@cs.wustl.edu>
* @author Matthias Kerkhoff
* @author Per Andersson
@ -51,5 +53,26 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#endif /* ACE_HAS_THREADS */
// hack to get around errors while compiling using split-cpp
#if defined (ACE_HAS_THREADS)
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
# if defined (ACE_IS_SPLITTING)
typedef ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex> ACE_Static_Object_Lock_Type;
# if defined (__GNUC__)
// With g++, suppress the warning that this is unused.
static ACE_Static_Object_Lock_Type *ACE_Static_Object_Lock_lock __attribute__ ((unused)) = 0;
# else
static ACE_Static_Object_Lock_Type *ACE_Static_Object_Lock_lock = 0;
# endif /* __GNUC__ */
# endif /* ACE_IS_SPLITTING */
ACE_END_VERSIONED_NAMESPACE_DECL
#endif /* ACE_HAS_THREADS */
#include /**/ "ace/post.h"
#endif /* ACE_STATIC_OBJECT_LOCK_H */