*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget --HG-- branch : trunk
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
// -*- C++ -*-
|
||||
|
||||
//==========================================================================
|
||||
/**
|
||||
* @file Synch_Traits.h
|
||||
@@ -11,20 +10,15 @@
|
||||
* @author Douglas C. Schmidt <[email protected]>
|
||||
*/
|
||||
//==========================================================================
|
||||
|
||||
#ifndef ACE_SYNCH_TRAITS_H
|
||||
#define ACE_SYNCH_TRAITS_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
#include /**/ "ace/config-all.h" /* Need to know threads, template settings */
|
||||
#include "ace/Lock.h"
|
||||
|
||||
#if !defined (ACE_LACKS_PRAGMA_ONCE)
|
||||
# pragma once
|
||||
#endif /* ACE_LACKS_PRAGMA_ONCE */
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
// Forward decl
|
||||
class ACE_Null_Mutex;
|
||||
class ACE_Null_Condition;
|
||||
@@ -37,9 +31,7 @@ class ACE_RW_Thread_Mutex;
|
||||
class ACE_Condition_Thread_Mutex;
|
||||
class ACE_Condition_Recursive_Thread_Mutex;
|
||||
class ACE_Thread_Semaphore;
|
||||
|
||||
#if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
|
||||
|
||||
/**
|
||||
* @class ACE_NULL_SYNCH
|
||||
*
|
||||
@@ -60,12 +52,9 @@ public:
|
||||
typedef ACE_Null_Semaphore SEMAPHORE;
|
||||
typedef ACE_Null_Mutex NULL_SEMAPHORE;
|
||||
};
|
||||
|
||||
#if defined (ACE_HAS_THREADS)
|
||||
|
||||
class ACE_Process_Mutex;
|
||||
class ACE_Condition_Recursive_Thread_Mutex;
|
||||
|
||||
/**
|
||||
* @class ACE_MT_SYNCH
|
||||
*
|
||||
@@ -89,9 +78,7 @@ public:
|
||||
typedef ACE_Thread_Semaphore SEMAPHORE;
|
||||
typedef ACE_Null_Semaphore NULL_SEMAPHORE;
|
||||
};
|
||||
|
||||
#endif /* ACE_HAS_THREADS */
|
||||
|
||||
#define ACE_SYNCH_MUTEX ACE_SYNCH::MUTEX
|
||||
#define ACE_SYNCH_NULL_MUTEX ACE_SYNCH::NULL_MUTEX
|
||||
#define ACE_SYNCH_RECURSIVE_MUTEX ACE_SYNCH::RECURSIVE_MUTEX
|
||||
@@ -100,9 +87,7 @@ public:
|
||||
#define ACE_SYNCH_RECURSIVE_CONDITION ACE_SYNCH::RECURSIVE_CONDITION
|
||||
#define ACE_SYNCH_NULL_SEMAPHORE ACE_SYNCH::NULL_SEMAPHORE
|
||||
#define ACE_SYNCH_SEMAPHORE ACE_SYNCH::SEMAPHORE
|
||||
|
||||
#else /* !ACE_HAS_TEMPLATE_TYPEDEFS */
|
||||
|
||||
#if defined (ACE_HAS_OPTIMIZED_MESSAGE_QUEUE)
|
||||
#define ACE_NULL_SYNCH ACE_Null_Mutex, ACE_Null_Condition, ACE_Null_Mutex
|
||||
#define ACE_MT_SYNCH ACE_Thread_Mutex, ACE_Condition_Thread_Mutex, ACE_Thread_Semaphore
|
||||
@@ -110,9 +95,7 @@ public:
|
||||
#define ACE_NULL_SYNCH ACE_Null_Mutex, ACE_Null_Condition
|
||||
#define ACE_MT_SYNCH ACE_Thread_Mutex, ACE_Condition_Thread_Mutex
|
||||
#endif /* ACE_HAS_OPTIMIZED_MESSAGE_QUEUE */
|
||||
|
||||
#if defined (ACE_HAS_THREADS)
|
||||
|
||||
#define ACE_SYNCH_MUTEX ACE_Thread_Mutex
|
||||
#define ACE_SYNCH_NULL_MUTEX ACE_Null_Mutex
|
||||
#define ACE_SYNCH_RECURSIVE_MUTEX ACE_Recursive_Thread_Mutex
|
||||
@@ -121,9 +104,7 @@ public:
|
||||
#define ACE_SYNCH_RECURSIVE_CONDITION ACE_Condition_Recursive_Thread_Mutex
|
||||
#define ACE_SYNCH_SEMAPHORE ACE_Thread_Semaphore
|
||||
#define ACE_SYNCH_NULL_SEMAPHORE ACE_Null_Semaphore
|
||||
|
||||
#else /* ACE_HAS_THREADS */
|
||||
|
||||
#define ACE_SYNCH_MUTEX ACE_Null_Mutex
|
||||
#define ACE_SYNCH_NULL_MUTEX ACE_Null_Mutex
|
||||
#define ACE_SYNCH_RECURSIVE_MUTEX ACE_Null_Mutex
|
||||
@@ -132,22 +113,17 @@ public:
|
||||
#define ACE_SYNCH_RECURSIVE_CONDITION ACE_Null_Condition
|
||||
#define ACE_SYNCH_SEMAPHORE ACE_Null_Semaphore
|
||||
#define ACE_SYNCH_NULL_SEMAPHORE ACE_Null_Mutex
|
||||
|
||||
#endif /* ACE_HAS_THREADS */
|
||||
#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
|
||||
|
||||
// These are available on *all* platforms
|
||||
#define ACE_SYNCH_PROCESS_SEMAPHORE ACE_Process_Semaphore
|
||||
#define ACE_SYNCH_PROCESS_MUTEX ACE_Process_Mutex
|
||||
|
||||
#if defined (ACE_HAS_THREADS)
|
||||
#define ACE_SYNCH ACE_MT_SYNCH
|
||||
#else /* ACE_HAS_THREADS */
|
||||
#define ACE_SYNCH ACE_NULL_SYNCH
|
||||
#endif /* ACE_HAS_THREADS */
|
||||
|
||||
ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
#include /**/ "ace/post.h"
|
||||
#endif /* ACE_SYNCH_TRAITS_H */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user