diff options
author | Shocker <shocker@freakz.ro> | 2011-04-29 22:24:26 +0300 |
---|---|---|
committer | Shocker <shocker@freakz.ro> | 2011-04-29 22:24:26 +0300 |
commit | 0fb8f057974cdf3107084be65005956efb5191dc (patch) | |
tree | 8fe211ecee643625c01ec3970038e345ec44c5f0 /src/server/shared/Dynamic | |
parent | f96e1ce1d7b10074750da761ff9b219a24d0f09f (diff) | |
parent | 1b1d7507f1c3ea768f3fdaf4e1729b66fe590a68 (diff) |
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src/server/shared/Dynamic')
-rwxr-xr-x | src/server/shared/Dynamic/LinkedReference/Reference.h | 18 | ||||
-rwxr-xr-x | src/server/shared/Dynamic/TypeContainerFunctions.h | 2 | ||||
-rwxr-xr-x | src/server/shared/Dynamic/TypeContainerFunctionsPtr.h | 10 | ||||
-rwxr-xr-x | src/server/shared/Dynamic/TypeList.h | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h index 34bb000dc17..be0e62135ec 100755 --- a/src/server/shared/Dynamic/LinkedReference/Reference.h +++ b/src/server/shared/Dynamic/LinkedReference/Reference.h @@ -71,15 +71,15 @@ template <class TO, class FROM> class Reference : public LinkedListElement return iRefTo != NULL; } - Reference<TO,FROM> * next() { return((Reference<TO,FROM> *) LinkedListElement::next()); } - Reference<TO,FROM> const * next() const { return((Reference<TO,FROM> const *) LinkedListElement::next()); } - Reference<TO,FROM> * prev() { return((Reference<TO,FROM> *) LinkedListElement::prev()); } - Reference<TO,FROM> const * prev() const { return((Reference<TO,FROM> const *) LinkedListElement::prev()); } - - Reference<TO,FROM> * nocheck_next() { return((Reference<TO,FROM> *) LinkedListElement::nocheck_next()); } - Reference<TO,FROM> const * nocheck_next() const { return((Reference<TO,FROM> const *) LinkedListElement::nocheck_next()); } - Reference<TO,FROM> * nocheck_prev() { return((Reference<TO,FROM> *) LinkedListElement::nocheck_prev()); } - Reference<TO,FROM> const * nocheck_prev() const { return((Reference<TO,FROM> const *) LinkedListElement::nocheck_prev()); } + Reference<TO, FROM> * next() { return((Reference<TO, FROM> *) LinkedListElement::next()); } + Reference<TO, FROM> const * next() const { return((Reference<TO, FROM> const *) LinkedListElement::next()); } + Reference<TO, FROM> * prev() { return((Reference<TO, FROM> *) LinkedListElement::prev()); } + Reference<TO, FROM> const * prev() const { return((Reference<TO, FROM> const *) LinkedListElement::prev()); } + + Reference<TO, FROM> * nocheck_next() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_next()); } + Reference<TO, FROM> const * nocheck_next() const { return((Reference<TO, FROM> const *) LinkedListElement::nocheck_next()); } + Reference<TO, FROM> * nocheck_prev() { return((Reference<TO, FROM> *) LinkedListElement::nocheck_prev()); } + Reference<TO, FROM> const * nocheck_prev() const { return((Reference<TO, FROM> const *) LinkedListElement::nocheck_prev()); } TO* operator ->() const { return iRefTo; } TO* getTarget() const { return iRefTo; } diff --git a/src/server/shared/Dynamic/TypeContainerFunctions.h b/src/server/shared/Dynamic/TypeContainerFunctions.h index dd5f6859e3a..981cd82197f 100755 --- a/src/server/shared/Dynamic/TypeContainerFunctions.h +++ b/src/server/shared/Dynamic/TypeContainerFunctions.h @@ -50,7 +50,7 @@ namespace Trinity template<class SPECIFIC_TYPE, class T> size_t Count(const ContainerMapList<TypeList<SPECIFIC_TYPE, T> >&elements, SPECIFIC_TYPE* fake) { - return Count(elements._elements,fake); + return Count(elements._elements, fake); } template<class SPECIFIC_TYPE, class H, class T> size_t Count(const ContainerMapList<TypeList<H, T> >&elements, SPECIFIC_TYPE* fake) diff --git a/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h b/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h index 8b7ef8f182d..9b43e325806 100755 --- a/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h +++ b/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h @@ -50,7 +50,7 @@ namespace Trinity // // template<class SPECIFIC_TYPE, class T> size_t Count(const ContainerMapList<TypeList<SPECIFIC_TYPE, T> >&elements, SPECIFIC_TYPE* fake) // { - // return Count(elements._elements,fake); + // return Count(elements._elements, fake); // } // // template<class SPECIFIC_TYPE, class H, class T> size_t Count(const ContainerMapList<TypeList<H, T> >&elements, SPECIFIC_TYPE* fake) @@ -77,8 +77,8 @@ namespace Trinity template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Find(ContainerMapList<TypeList<H, T> >&elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* fake) { - CountedPtr<SPECIFIC_TYPE> &t = Find(elements._elements, hdl,fake); - return (!t ? Find(elements._TailElements, hdl,fake) : t); + CountedPtr<SPECIFIC_TYPE> &t = Find(elements._elements, hdl, fake); + return (!t ? Find(elements._TailElements, hdl, fake) : t); } // const find functions @@ -100,9 +100,9 @@ namespace Trinity template<class SPECIFIC_TYPE, class H, class T> CountedPtr<SPECIFIC_TYPE>& Find(const ContainerMapList<TypeList<H, T> >&elements, OBJECT_HANDLE hdl, CountedPtr<SPECIFIC_TYPE>* fake) { - CountedPtr<SPECIFIC_TYPE> &t = Find(elements._elements, hdl,fake); + CountedPtr<SPECIFIC_TYPE> &t = Find(elements._elements, hdl, fake); if(!t) - t = Find(elements._TailElement, hdl,fake); + t = Find(elements._TailElement, hdl, fake); return t; } diff --git a/src/server/shared/Dynamic/TypeList.h b/src/server/shared/Dynamic/TypeList.h index b525b77da31..588bfc65755 100755 --- a/src/server/shared/Dynamic/TypeList.h +++ b/src/server/shared/Dynamic/TypeList.h @@ -35,7 +35,7 @@ struct TypeList }; // enough for now.. can be expand at any point in time as needed -#define TYPELIST_1(T1) TypeList<T1,TypeNull> +#define TYPELIST_1(T1) TypeList<T1, TypeNull> #define TYPELIST_2(T1, T2) TypeList<T1, TYPELIST_1(T2) > #define TYPELIST_3(T1, T2, T3) TypeList<T1, TYPELIST_2(T2, T3) > #define TYPELIST_4(T1, T2, T3, T4) TypeList<T1, TYPELIST_3(T2, T3, T4) > |