*Merge.

--HG--
branch : trunk

32 files changed, 32 insertions, 0 deletions

diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/framework/Dynamic/FactoryHolder.h
index a9c7a718541..39c6061a687 100644
--- a/src/framework/Dynamic/FactoryHolder.h
+++ b/src/framework/Dynamic/FactoryHolder.h
@@ -60,3 +60,4 @@ class Permissible
         virtual int Permit(const T *) const = 0;
 };
 #endif
+
diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h
index 25dfa9f5092..6e4b9aca53b 100644
--- a/src/framework/Dynamic/ObjectRegistry.h
+++ b/src/framework/Dynamic/ObjectRegistry.h
@@ -108,3 +108,4 @@ class TRINITY_DLL_DECL ObjectRegistry
         }
 };
 #endif
+
diff --git a/src/framework/GameSystem/Grid.h b/src/framework/GameSystem/Grid.h
index a239795f3c3..a60b7306efb 100644
--- a/src/framework/GameSystem/Grid.h
+++ b/src/framework/GameSystem/Grid.h
@@ -129,3 +129,4 @@ class TRINITY_DLL_DECL Grid
         TypeMapContainer<WORLD_OBJECT_TYPES> i_objects;
 };
 #endif
+
diff --git a/src/framework/GameSystem/GridLoader.h b/src/framework/GameSystem/GridLoader.h
index 882974b81b0..23d32858e50 100644
--- a/src/framework/GameSystem/GridLoader.h
+++ b/src/framework/GameSystem/GridLoader.h
@@ -76,3 +76,4 @@ class TRINITY_DLL_DECL GridLoader
         }
 };
 #endif
+
diff --git a/src/framework/GameSystem/GridRefManager.h b/src/framework/GameSystem/GridRefManager.h
index d233b844572..715d13fa2fe 100644
--- a/src/framework/GameSystem/GridRefManager.h
+++ b/src/framework/GameSystem/GridRefManager.h
@@ -41,3 +41,4 @@ class GridRefManager : public RefManager<GridRefManager<OBJECT>, OBJECT>
         iterator rend() { return iterator(NULL); }
 };
 #endif
+
diff --git a/src/framework/GameSystem/GridReference.h b/src/framework/GameSystem/GridReference.h
index 65592e780b1..5f9dbaf5279 100644
--- a/src/framework/GameSystem/GridReference.h
+++ b/src/framework/GameSystem/GridReference.h
@@ -52,3 +52,4 @@ class TRINITY_DLL_SPEC GridReference : public Reference<GridRefManager<OBJECT>,
         GridReference *next() { return (GridReference*)Reference<GridRefManager<OBJECT>, OBJECT>::next(); }
 };
 #endif
+
diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h
index ecb20ff5069..617c85d735d 100644
--- a/src/framework/GameSystem/NGrid.h
+++ b/src/framework/GameSystem/NGrid.h
@@ -160,3 +160,4 @@ class TRINITY_DLL_DECL NGrid
         bool i_GridObjectDataLoaded;
 };
 #endif
+
diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h
index b7949b8b461..8d4989debb7 100644
--- a/src/framework/GameSystem/TypeContainer.h
+++ b/src/framework/GameSystem/TypeContainer.h
@@ -128,3 +128,4 @@ class TRINITY_DLL_DECL TypeMapContainer
         ContainerMapList<OBJECT_TYPES> i_elements;
 };
 #endif
+
diff --git a/src/framework/GameSystem/TypeContainerFunctions.h b/src/framework/GameSystem/TypeContainerFunctions.h
index 4dc1bcf79ba..4ca4e660236 100644
--- a/src/framework/GameSystem/TypeContainerFunctions.h
+++ b/src/framework/GameSystem/TypeContainerFunctions.h
@@ -172,3 +172,4 @@ namespace Trinity
 
 }
 #endif
+
diff --git a/src/framework/GameSystem/TypeContainerFunctionsPtr.h b/src/framework/GameSystem/TypeContainerFunctionsPtr.h
index 33df2b1461c..6bb4c9e4bf5 100644
--- a/src/framework/GameSystem/TypeContainerFunctionsPtr.h
+++ b/src/framework/GameSystem/TypeContainerFunctionsPtr.h
@@ -167,3 +167,4 @@ namespace Trinity
 
 }
 #endif
+
diff --git a/src/framework/GameSystem/TypeContainerVisitor.h b/src/framework/GameSystem/TypeContainerVisitor.h
index c6999a88384..40f61b65cc4 100644
--- a/src/framework/GameSystem/TypeContainerVisitor.h
+++ b/src/framework/GameSystem/TypeContainerVisitor.h
@@ -116,3 +116,4 @@ class TRINITY_DLL_DECL TypeContainerVisitor
         VISITOR &i_visitor;
 };
 #endif
+
diff --git a/src/framework/Network/SocketDefines.h b/src/framework/Network/SocketDefines.h
index b5c0434c1d3..bb59725bb76 100644
--- a/src/framework/Network/SocketDefines.h
+++ b/src/framework/Network/SocketDefines.h
@@ -46,3 +46,4 @@ typedef int SocketHandle;
 typedef fd_set SelectSet;
 #endif
 #endif
+
diff --git a/src/framework/Platform/CompilerDefs.h b/src/framework/Platform/CompilerDefs.h
index cd7b6ff55bb..64d4976210c 100644
--- a/src/framework/Platform/CompilerDefs.h
+++ b/src/framework/Platform/CompilerDefs.h
@@ -61,3 +61,4 @@
 #  pragma warning( disable : 4786 )                         // identifier was truncated to '255' characters in the debug information
 #endif
 #endif
+
diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h
index 5228359589b..cf4fa3e0def 100644
--- a/src/framework/Platform/Define.h
+++ b/src/framework/Platform/Define.h
@@ -123,3 +123,4 @@ typedef uint32      DWORD;
 typedef uint64 OBJECT_HANDLE;
 
 #endif //TRINITY_DEFINE_H
+
diff --git a/src/framework/Policies/CreationPolicy.h b/src/framework/Policies/CreationPolicy.h
index 72a7e265d62..df46d764917 100644
--- a/src/framework/Policies/CreationPolicy.h
+++ b/src/framework/Policies/CreationPolicy.h
@@ -107,3 +107,4 @@ namespace Trinity
     };
 }
 #endif
+
diff --git a/src/framework/Policies/ObjectLifeTime.cpp b/src/framework/Policies/ObjectLifeTime.cpp
index 15bcaa54686..cb963f9c2b0 100644
--- a/src/framework/Policies/ObjectLifeTime.cpp
+++ b/src/framework/Policies/ObjectLifeTime.cpp
@@ -33,3 +33,4 @@ namespace Trinity
         external_wrapper((void*)func);
     }
 }
+
diff --git a/src/framework/Policies/ObjectLifeTime.h b/src/framework/Policies/ObjectLifeTime.h
index acd8516fc56..aaf46810085 100644
--- a/src/framework/Policies/ObjectLifeTime.h
+++ b/src/framework/Policies/ObjectLifeTime.h
@@ -50,3 +50,4 @@ namespace Trinity
     }
 }
 #endif
+
diff --git a/src/framework/Policies/Singleton.h b/src/framework/Policies/Singleton.h
index 0f382197f1f..6961200c760 100644
--- a/src/framework/Policies/Singleton.h
+++ b/src/framework/Policies/Singleton.h
@@ -62,3 +62,4 @@ namespace Trinity
     };
 }
 #endif
+
diff --git a/src/framework/Policies/SingletonImp.h b/src/framework/Policies/SingletonImp.h
index 16bfa2c4b05..20d311858a7 100644
--- a/src/framework/Policies/SingletonImp.h
+++ b/src/framework/Policies/SingletonImp.h
@@ -90,3 +90,4 @@ Trinity::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::DestroySing
     template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_instance = 0; \
     template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_destroyed = false
 #endif
+
diff --git a/src/framework/Policies/ThreadingModel.h b/src/framework/Policies/ThreadingModel.h
index 08d72854781..e41ed53b416 100644
--- a/src/framework/Policies/ThreadingModel.h
+++ b/src/framework/Policies/ThreadingModel.h
@@ -127,3 +127,4 @@ template<class T, class MUTEX> MUTEX Trinity::ClassLevelLockable<T, MUTEX>::si_m
 #define INSTANTIATE_CLASS_MUTEX(CTYPE,MUTEX) \
     template class TRINITY_DLL_DECL Trinity::ClassLevelLockable<CTYPE, MUTEX >
 #endif
+
diff --git a/src/framework/Utilities/ByteConverter.h b/src/framework/Utilities/ByteConverter.h
index 59081ef8ccd..bfb5fea1471 100644
--- a/src/framework/Utilities/ByteConverter.h
+++ b/src/framework/Utilities/ByteConverter.h
@@ -63,3 +63,4 @@ inline void EndianConvertReverse(uint8&) { }
 inline void EndianConvertReverse( int8&) { }
 
 #endif
+
diff --git a/src/framework/Utilities/Callback.h b/src/framework/Utilities/Callback.h
index 29de60d998d..05fa2d9d160 100644
--- a/src/framework/Utilities/Callback.h
+++ b/src/framework/Utilities/Callback.h
@@ -382,3 +382,4 @@ namespace Trinity
 }
 
 #endif
+
diff --git a/src/framework/Utilities/CountedReference/Reference.h b/src/framework/Utilities/CountedReference/Reference.h
index 693df05dddc..3c4a2185651 100644
--- a/src/framework/Utilities/CountedReference/Reference.h
+++ b/src/framework/Utilities/CountedReference/Reference.h
@@ -97,3 +97,4 @@ class TRINITY_DLL_DECL Referencer
         ReferenceeHolder *i_holder;
 };
 #endif
+
diff --git a/src/framework/Utilities/CountedReference/ReferenceHolder.h b/src/framework/Utilities/CountedReference/ReferenceHolder.h
index 0c2294fc8c5..f4cbf240493 100644
--- a/src/framework/Utilities/CountedReference/ReferenceHolder.h
+++ b/src/framework/Utilities/CountedReference/ReferenceHolder.h
@@ -39,3 +39,4 @@ struct ReferenceHolder : public THREADING_MODEL
     typedef typename THREADING_MODEL::Lock Lock;
 };
 #endif
+
diff --git a/src/framework/Utilities/CountedReference/ReferenceImpl.h b/src/framework/Utilities/CountedReference/ReferenceImpl.h
index ef217a72dd9..b3f7ab2aab7 100644
--- a/src/framework/Utilities/CountedReference/ReferenceImpl.h
+++ b/src/framework/Utilities/CountedReference/ReferenceImpl.h
@@ -130,3 +130,4 @@ Referencer<T, THREADING_MODEL>::addReference(ReferenceHolder<T, THREADING_MODEL>
     ++holder->i_referenceCount;
 }
 #endif
+
diff --git a/src/framework/Utilities/EventProcessor.cpp b/src/framework/Utilities/EventProcessor.cpp
index cd80a9effcc..b547392065a 100644
--- a/src/framework/Utilities/EventProcessor.cpp
+++ b/src/framework/Utilities/EventProcessor.cpp
@@ -98,3 +98,4 @@ uint64 EventProcessor::CalculateTime(uint64 t_offset)
 {
     return(m_time + t_offset);
 }
+
diff --git a/src/framework/Utilities/EventProcessor.h b/src/framework/Utilities/EventProcessor.h
index 508da2cc0fd..0ce4251def7 100644
--- a/src/framework/Utilities/EventProcessor.h
+++ b/src/framework/Utilities/EventProcessor.h
@@ -70,3 +70,4 @@ class EventProcessor
         bool m_aborting;
 };
 #endif
+
diff --git a/src/framework/Utilities/LinkedList.h b/src/framework/Utilities/LinkedList.h
index 347fe7fa849..a25bbf75d5e 100644
--- a/src/framework/Utilities/LinkedList.h
+++ b/src/framework/Utilities/LinkedList.h
@@ -246,3 +246,4 @@ class LinkedListHead
 
 //============================================
 #endif
+
diff --git a/src/framework/Utilities/LinkedReference/RefManager.h b/src/framework/Utilities/LinkedReference/RefManager.h
index bfb163cc9c9..5f0e3a9e10b 100644
--- a/src/framework/Utilities/LinkedReference/RefManager.h
+++ b/src/framework/Utilities/LinkedReference/RefManager.h
@@ -55,3 +55,4 @@ template <class TO, class FROM> class RefManager : public LinkedListHead
 
 //=====================================================
 #endif
+
diff --git a/src/framework/Utilities/LinkedReference/Reference.h b/src/framework/Utilities/LinkedReference/Reference.h
index 28c77d918aa..bba58cf06d3 100644
--- a/src/framework/Utilities/LinkedReference/Reference.h
+++ b/src/framework/Utilities/LinkedReference/Reference.h
@@ -91,3 +91,4 @@ template <class TO, class FROM> class Reference : public LinkedListElement
 
 //=====================================================
 #endif
+
diff --git a/src/framework/Utilities/TypeList.h b/src/framework/Utilities/TypeList.h
index daa6886467a..143a9738381 100644
--- a/src/framework/Utilities/TypeList.h
+++ b/src/framework/Utilities/TypeList.h
@@ -43,3 +43,4 @@ struct TypeList
 #define TYPELIST_4(T1, T2, T3, T4)      TypeList<T1, TYPELIST_3(T2, T3, T4) >
 #define TYPELIST_5(T1, T2, T3, T4, T5)  TypeList<T1, TYPELIST_4(T2, T3, T4, T5) >
 #endif
+
diff --git a/src/framework/Utilities/UnorderedMap.h b/src/framework/Utilities/UnorderedMap.h
index 31cd453ecba..a1de27cb615 100644
--- a/src/framework/Utilities/UnorderedMap.h
+++ b/src/framework/Utilities/UnorderedMap.h
@@ -70,3 +70,4 @@ namespace __gnu_cxx
 using std::hash_map;
 #endif
 #endif
+