diff options
| author | Sebastian Valle <s.v.h21@hotmail.com> | 2013-10-29 13:13:37 -0500 |
|---|---|---|
| committer | Sebastian Valle <s.v.h21@hotmail.com> | 2013-10-29 13:13:37 -0500 |
| commit | bb057ae40be2733f3f582a93e585b8bb67cf1520 (patch) | |
| tree | 76a7f9727dc33d068b3c2433189bee42a7edcde1 /src/server/shared/Threading | |
| parent | 4ce12dc481323c11b4830d06f8080412d855cc64 (diff) | |
| parent | 3d5a317b755f4b6eb2d9a29fd7d9291415dfa6eb (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw
Conflicts:
src/server/collision/Management/MMapManager.h
Diffstat (limited to 'src/server/shared/Threading')
| -rw-r--r-- | src/server/shared/Threading/Callback.h | 4 | ||||
| -rw-r--r-- | src/server/shared/Threading/DelayExecutor.cpp | 4 | ||||
| -rw-r--r-- | src/server/shared/Threading/Threading.h | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/server/shared/Threading/Callback.h b/src/server/shared/Threading/Callback.h index e0215f5b3d3..d4214cf0843 100644 --- a/src/server/shared/Threading/Callback.h +++ b/src/server/shared/Threading/Callback.h @@ -35,7 +35,7 @@ template <typename Result, typename ParamType, bool chain = false> class QueryCallback { public: - QueryCallback() : _param(), _stage(chain ? 0 : CALLBACK_STAGE_INVALID) {} + QueryCallback() : _param(), _stage(chain ? 0 : CALLBACK_STAGE_INVALID) { } //! The parameter of this function should be a resultset returned from either .AsyncQuery or .AsyncPQuery void SetFutureResult(ACE_Future<Result> value) @@ -115,7 +115,7 @@ template <typename Result, typename ParamType1, typename ParamType2, bool chain class QueryCallback_2 { public: - QueryCallback_2() : _stage(chain ? 0 : CALLBACK_STAGE_INVALID) {} + QueryCallback_2() : _stage(chain ? 0 : CALLBACK_STAGE_INVALID) { } //! The parameter of this function should be a resultset returned from either .AsyncQuery or .AsyncPQuery void SetFutureResult(ACE_Future<Result> value) diff --git a/src/server/shared/Threading/DelayExecutor.cpp b/src/server/shared/Threading/DelayExecutor.cpp index 685e86e2a2f..ba8a19429b2 100644 --- a/src/server/shared/Threading/DelayExecutor.cpp +++ b/src/server/shared/Threading/DelayExecutor.cpp @@ -10,9 +10,7 @@ DelayExecutor* DelayExecutor::instance() } DelayExecutor::DelayExecutor() - : pre_svc_hook_(0), post_svc_hook_(0), activated_(false) -{ -} + : pre_svc_hook_(0), post_svc_hook_(0), activated_(false) { } DelayExecutor::~DelayExecutor() { diff --git a/src/server/shared/Threading/Threading.h b/src/server/shared/Threading/Threading.h index 3f2c121d666..00be82c6555 100644 --- a/src/server/shared/Threading/Threading.h +++ b/src/server/shared/Threading/Threading.h @@ -30,7 +30,7 @@ namespace ACE_Based class Runnable { public: - virtual ~Runnable() {} + virtual ~Runnable() { } virtual void run() = 0; void incReference() { ++m_refs; } @@ -100,7 +100,7 @@ namespace ACE_Based typedef ACE_TSS<Thread> ThreadStorage; //global object - container for Thread class representation of every thread static ThreadStorage m_ThreadStorage; - //use this object to determine current OS thread priority values mapped to enum Priority{} + //use this object to determine current OS thread priority values mapped to enum Priority{ } static ThreadPriority m_TpEnum; }; |