*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,9 +1,7 @@
|
||||
// -*- C++ -*-
|
||||
//
|
||||
// $Id: Strategies_T.inl 81503 2008-04-28 18:28:15Z johnnyw $
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE
|
||||
ACE_Singleton_Strategy<SVC_HANDLER>::ACE_Singleton_Strategy (SVC_HANDLER *sh,
|
||||
ACE_Thread_Manager *tm)
|
||||
@@ -16,7 +14,6 @@ ACE_Singleton_Strategy<SVC_HANDLER>::ACE_Singleton_Strategy (SVC_HANDLER *sh,
|
||||
ACE_TEXT ("%p\n"),
|
||||
ACE_TEXT ("ACE_Singleton_Strategy")));
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE int
|
||||
ACE_Creation_Strategy<SVC_HANDLER>::open (ACE_Thread_Manager *thr_mgr,
|
||||
ACE_Reactor *reactor)
|
||||
@@ -26,7 +23,6 @@ ACE_Creation_Strategy<SVC_HANDLER>::open (ACE_Thread_Manager *thr_mgr,
|
||||
this->reactor_ = reactor;
|
||||
return 0;
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE
|
||||
ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy (ACE_Thread_Manager *thr_mgr,
|
||||
ACE_Reactor *reactor)
|
||||
@@ -37,7 +33,6 @@ ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy (ACE_Thread_Manager *t
|
||||
ACE_TEXT ("%p\n"),
|
||||
ACE_TEXT ("ACE_Creation_Strategy")));
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE
|
||||
ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const ACE_TCHAR dll_name[],
|
||||
const ACE_TCHAR factory_function[],
|
||||
@@ -55,27 +50,23 @@ ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const ACE_TCHAR dll_name[],
|
||||
ACE_TEXT ("%p\n"),
|
||||
ACE_TEXT ("open")));
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE
|
||||
ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (void)
|
||||
{
|
||||
ACE_TRACE ("ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy");
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE
|
||||
ACE_Concurrency_Strategy<SVC_HANDLER>::ACE_Concurrency_Strategy (int flags)
|
||||
: flags_ (flags)
|
||||
{
|
||||
ACE_TRACE ("ACE_Concurrency_Strategy<SVC_HANDLER>::ACE_Concurrency_Strategy");
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE
|
||||
ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (ACE_Reactor *reactor,
|
||||
ACE_Reactor_Mask mask,
|
||||
int flags)
|
||||
{
|
||||
ACE_TRACE ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy");
|
||||
|
||||
if (this->open (reactor,
|
||||
mask,
|
||||
flags) == -1)
|
||||
@@ -83,7 +74,6 @@ ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (ACE_Reactor *reactor,
|
||||
ACE_TEXT ("%p\n"),
|
||||
ACE_TEXT ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy")));
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE
|
||||
ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (int flags)
|
||||
: ACE_Concurrency_Strategy<SVC_HANDLER> (flags),
|
||||
@@ -92,7 +82,6 @@ ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (int flags)
|
||||
{
|
||||
ACE_TRACE ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy");
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE
|
||||
ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (ACE_Thread_Manager *thr_mgr,
|
||||
long thr_flags,
|
||||
@@ -100,7 +89,6 @@ ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (ACE_Thread_Manager *thr_m
|
||||
int flags)
|
||||
{
|
||||
ACE_TRACE ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy");
|
||||
|
||||
if (this->open (thr_mgr,
|
||||
thr_flags,
|
||||
n_threads,
|
||||
@@ -109,7 +97,6 @@ ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (ACE_Thread_Manager *thr_m
|
||||
ACE_TEXT ("%p\n"),
|
||||
ACE_TEXT ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy")));
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE
|
||||
ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (int flags)
|
||||
: ACE_Concurrency_Strategy<SVC_HANDLER> (flags),
|
||||
@@ -119,20 +106,17 @@ ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (int flags)
|
||||
{
|
||||
ACE_TRACE ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy");
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_INLINE
|
||||
ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy (ACE_Reactor *reactor)
|
||||
: reactor_ (reactor)
|
||||
{
|
||||
ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy");
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_INLINE
|
||||
ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connect_Strategy (void)
|
||||
{
|
||||
ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connect_Strategy");
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE
|
||||
ACE_Process_Strategy<SVC_HANDLER>::ACE_Process_Strategy (size_t n_processes,
|
||||
ACE_Event_Handler *acceptor,
|
||||
@@ -148,39 +132,33 @@ ACE_Process_Strategy<SVC_HANDLER>::ACE_Process_Strategy (size_t n_processes,
|
||||
ACE_TEXT ("%p\n"),
|
||||
ACE_TEXT ("ACE_Process_Strategy")));
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE
|
||||
ACE_Scheduling_Strategy<SVC_HANDLER>::ACE_Scheduling_Strategy (SVC_HANDLER *)
|
||||
{
|
||||
ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::ACE_Scheduling_Strategy");
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE
|
||||
ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::ACE_Schedule_All_Reactive_Strategy
|
||||
(SVC_HANDLER *scheduler)
|
||||
: ACE_Scheduling_Strategy<SVC_HANDLER> (scheduler)
|
||||
{
|
||||
ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::ACE_Schedule_All_Reactive_Strategy");
|
||||
|
||||
if (scheduler == 0 || scheduler->reactor () == 0)
|
||||
this->reactor_ = ACE_Reactor::instance ();
|
||||
else
|
||||
this->reactor_ = scheduler->reactor ();
|
||||
}
|
||||
|
||||
template <class SVC_HANDLER> ACE_INLINE
|
||||
ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::ACE_Schedule_All_Threaded_Strategy
|
||||
(SVC_HANDLER *scheduler)
|
||||
: ACE_Scheduling_Strategy<SVC_HANDLER> (scheduler)
|
||||
{
|
||||
ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::ACE_Schedule_All_Threaded_Strategy");
|
||||
|
||||
if (scheduler == 0 || scheduler->thr_mgr () == 0)
|
||||
this->thr_mgr_ = ACE_Thread_Manager::instance ();
|
||||
else
|
||||
this->thr_mgr_ = scheduler->thr_mgr ();
|
||||
}
|
||||
|
||||
template <class T> ACE_INLINE
|
||||
ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (void)
|
||||
: ACE_Refcountable (0),
|
||||
@@ -189,7 +167,6 @@ ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (void)
|
||||
t_ ()
|
||||
{
|
||||
}
|
||||
|
||||
template <class T> ACE_INLINE
|
||||
ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (const T &t,
|
||||
long refcount,
|
||||
@@ -200,19 +177,16 @@ ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (const T &t,
|
||||
t_ (t)
|
||||
{
|
||||
}
|
||||
|
||||
template <class T> ACE_INLINE u_long
|
||||
ACE_Refcounted_Hash_Recyclable<T>::hash_i (void) const
|
||||
{
|
||||
return this->t_.hash ();
|
||||
}
|
||||
|
||||
template <class T> ACE_INLINE T &
|
||||
ACE_Refcounted_Hash_Recyclable<T>::subject (void)
|
||||
{
|
||||
return this->t_;
|
||||
}
|
||||
|
||||
template <class T> ACE_INLINE bool
|
||||
ACE_Refcounted_Hash_Recyclable<T>::operator== (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const
|
||||
{
|
||||
@@ -220,11 +194,9 @@ ACE_Refcounted_Hash_Recyclable<T>::operator== (const ACE_Refcounted_Hash_Recycla
|
||||
this->recycle_state () == rhs.recycle_state ()
|
||||
&& this->t_ == rhs.t_;
|
||||
}
|
||||
|
||||
template <class T> ACE_INLINE bool
|
||||
ACE_Refcounted_Hash_Recyclable<T>::operator!= (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const
|
||||
{
|
||||
return !this->operator== (rhs);
|
||||
}
|
||||
|
||||
ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
Reference in New Issue
Block a user