A great purge of obsolete macros.

--HG--
branch : trunk

16 files changed, 27 insertions, 87 deletions

diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/framework/Dynamic/FactoryHolder.h
index 3505bf46e9b..282968d6097 100644
--- a/src/framework/Dynamic/FactoryHolder.h
+++ b/src/framework/Dynamic/FactoryHolder.h
@@ -29,7 +29,7 @@
 /** FactoryHolder holds a factory object of a specific type
  */
 template<class T, class Key = std::string>
-class TRINITY_DLL_DECL FactoryHolder
+class FactoryHolder
 {
     public:
         typedef ObjectRegistry<FactoryHolder<T, Key >, Key > FactoryHolderRegistry;
diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h
index 07fd64ea002..e6619427885 100644
--- a/src/framework/Dynamic/ObjectRegistry.h
+++ b/src/framework/Dynamic/ObjectRegistry.h
@@ -32,7 +32,7 @@
 /** ObjectRegistry holds all registry item of the same type
  */
 template<class T, class Key = std::string>
-class TRINITY_DLL_DECL ObjectRegistry
+class ObjectRegistry
 {
     public:
         typedef std::map<Key, T *> RegistryMapType;
diff --git a/src/framework/GameSystem/Grid.h b/src/framework/GameSystem/Grid.h
index a928bbba9a6..65bf3c92f9d 100644
--- a/src/framework/GameSystem/Grid.h
+++ b/src/framework/GameSystem/Grid.h
@@ -47,7 +47,7 @@ class WORLD_OBJECT_TYPES,
 class GRID_OBJECT_TYPES,
 class ThreadModel = Trinity::SingleThreaded<ACTIVE_OBJECT>
 >
-class TRINITY_DLL_DECL Grid
+class Grid
 {
     // allows the GridLoader to access its internals
     template<class A, class T, class O> friend class GridLoader;
diff --git a/src/framework/GameSystem/GridLoader.h b/src/framework/GameSystem/GridLoader.h
index 07608ae8571..03fa0f5b813 100644
--- a/src/framework/GameSystem/GridLoader.h
+++ b/src/framework/GameSystem/GridLoader.h
@@ -42,7 +42,7 @@ class ACTIVE_OBJECT,
 class WORLD_OBJECT_TYPES,
 class GRID_OBJECT_TYPES
 >
-class TRINITY_DLL_DECL GridLoader
+class GridLoader
 {
     public:
 
diff --git a/src/framework/GameSystem/GridReference.h b/src/framework/GameSystem/GridReference.h
index db14ae32bfa..d2e3a455895 100644
--- a/src/framework/GameSystem/GridReference.h
+++ b/src/framework/GameSystem/GridReference.h
@@ -27,7 +27,7 @@ template<class OBJECT>
 class GridRefManager;
 
 template<class OBJECT>
-class TRINITY_DLL_SPEC GridReference : public Reference<GridRefManager<OBJECT>, OBJECT>
+class GridReference : public Reference<GridRefManager<OBJECT>, OBJECT>
 {
     protected:
         void targetObjectBuildLink()
diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h
index 6cbe7d6a84c..de3f4ccf56d 100644
--- a/src/framework/GameSystem/NGrid.h
+++ b/src/framework/GameSystem/NGrid.h
@@ -70,7 +70,7 @@ class WORLD_OBJECT_TYPES,
 class GRID_OBJECT_TYPES,
 class ThreadModel = Trinity::SingleThreaded<ACTIVE_OBJECT>
 >
-class TRINITY_DLL_DECL NGrid
+class NGrid
 {
     public:
 
diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h
index 4297aaf32e7..c2c9b4fcdea 100644
--- a/src/framework/GameSystem/TypeContainer.h
+++ b/src/framework/GameSystem/TypeContainer.h
@@ -97,7 +97,7 @@ template<class H, class T> struct ContainerList<TypeList<H, T> >
  */
 
 template<class OBJECT_TYPES>
-class TRINITY_DLL_DECL TypeMapContainer
+class TypeMapContainer
 {
     public:
         template<class SPECIFIC_TYPE> size_t Count() const { return Trinity::Count(i_elements, (SPECIFIC_TYPE*)NULL); }
diff --git a/src/framework/GameSystem/TypeContainerVisitor.h b/src/framework/GameSystem/TypeContainerVisitor.h
index 28f5aa85e0d..f15075e5afd 100644
--- a/src/framework/GameSystem/TypeContainerVisitor.h
+++ b/src/framework/GameSystem/TypeContainerVisitor.h
@@ -97,7 +97,7 @@ template<class VISITOR, class OBJECT_TYPES> void VisitorHelper(VISITOR &v, TypeM
 }
 
 template<class VISITOR, class TYPE_CONTAINER>
-class TRINITY_DLL_DECL TypeContainerVisitor
+class TypeContainerVisitor
 {
     public:
         TypeContainerVisitor(VISITOR &v) : i_visitor(v) {}
diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h
index a284cf27cb2..205135c62d0 100644
--- a/src/framework/Platform/Define.h
+++ b/src/framework/Platform/Define.h
@@ -40,21 +40,9 @@
 #endif //TRINITY_ENDIAN
 
 #if PLATFORM == PLATFORM_WINDOWS
-#  define TRINITY_EXPORT __declspec(dllexport)
-#  define TRINITY_LIBRARY_HANDLE HMODULE
-#  define TRINITY_LOAD_LIBRARY(a) LoadLibrary(a)
-#  define TRINITY_CLOSE_LIBRARY FreeLibrary
-#  define TRINITY_GET_PROC_ADDR GetProcAddress
 #  define TRINITY_IMPORT __cdecl
-#  define TRINITY_SCRIPT_EXT ".dll"
-#  define TRINITY_SCRIPT_NAME "TrinityScript"
 #  define TRINITY_PATH_MAX MAX_PATH
 #else //PLATFORM != PLATFORM_WINDOWS
-#  define TRINITY_LIBRARY_HANDLE void*
-#  define TRINITY_EXPORT export
-#  define TRINITY_LOAD_LIBRARY(a) dlopen(a,RTLD_NOW)
-#  define TRINITY_CLOSE_LIBRARY dlclose
-#  define TRINITY_GET_PROC_ADDR dlsym
 #  if defined(__APPLE_CC__) && defined(BIG_ENDIAN)
 #    define TRINITY_IMPORT __attribute__ ((longcall))
 #  elif defined(__x86_64__)
@@ -62,45 +50,15 @@
 #  else
 #    define TRINITY_IMPORT __attribute__ ((cdecl))
 #  endif //__APPLE_CC__ && BIG_ENDIAN
-#  if defined(__APPLE_CC__)
-#    define TRINITY_SCRIPT_EXT ".dylib"
-#    if defined(DO_SCRIPTS)
-#      define TRINITY_SCRIPT_NAME "../lib/libtrinityscript"
-#    else
-#      define TRINITY_SCRIPT_NAME "../lib/libtrinityinterface"
-#    endif // DO_SCRIPTS
-#  else
-#    define TRINITY_SCRIPT_EXT ".so"
-#    if defined(DO_SCRIPTS)
-#      define TRINITY_SCRIPT_NAME "libtrinityscript"
-#    else
-#      define TRINITY_SCRIPT_NAME "libtrinityinterface"
-#    endif // DO_SCRIPTS
-#  endif //__APPLE_CC__
 #  define TRINITY_PATH_MAX PATH_MAX
 #endif //PLATFORM
 
-#if PLATFORM == PLATFORM_WINDOWS
-#  ifdef TRINITY_WIN32_DLL_IMPORT
-#    define TRINITY_DLL_DECL __declspec(dllimport)
-#  else //!TRINITY_WIN32_DLL_IMPORT
-#    ifdef TRINITY_WIND_DLL_EXPORT
-#      define TRINITY_DLL_DECL __declspec(dllexport)
-#    else //!TRINITY_WIND_DLL_EXPORT
-#      define TRINITY_DLL_DECL
-#    endif //TRINITY_WIND_DLL_EXPORT
-#  endif //TRINITY_WIN32_DLL_IMPORT
-#else //PLATFORM != PLATFORM_WINDOWS
-#  define TRINITY_DLL_DECL
-#endif //PLATFORM
 
 #if PLATFORM == PLATFORM_WINDOWS
-#  define TRINITY_DLL_SPEC __declspec(dllexport)
 #  ifndef DECLSPEC_NORETURN
 #    define DECLSPEC_NORETURN __declspec(noreturn)
 #  endif //DECLSPEC_NORETURN
 #else //PLATFORM != PLATFORM_WINDOWS
-#  define TRINITY_DLL_SPEC
 #  define DECLSPEC_NORETURN
 #endif //PLATFORM
 
@@ -137,26 +95,8 @@ typedef uint32      DWORD;
 
 typedef uint64 OBJECT_HANDLE;
 
-//commented out
-//so all future merges with invalid style will drop build errors
-//this way devs will at least read thru what they merge to find the error
-
-//#define MaNGOS              Trinity
-//#define MANGOS_DLL_DECL     TRINITY_DLL_DECL
-//#define MANGOS_DLL_SPEC     TRINITY_DLL_SPEC
-//#define GetMangosString     GetTrinityString
-
-#if defined(MANGOS_DEBUG) || defined(TRINITY_DEBUG)
-#  ifndef TRINITY_DEBUG
-#    define TRINITY_DEBUG
-#  endif
-#  ifndef MANGOS_DEBUG
-#    define MANGOS_DEBUG
-#  endif
-#endif
-
 #ifndef CLIENT_VER
-#define CLIENT_VER 313
+#define CLIENT_VER 322
 #endif
 
 #endif //TRINITY_DEFINE_H
diff --git a/src/framework/Policies/CreationPolicy.h b/src/framework/Policies/CreationPolicy.h
index 32189d8ef44..8552ce7da52 100644
--- a/src/framework/Policies/CreationPolicy.h
+++ b/src/framework/Policies/CreationPolicy.h
@@ -30,7 +30,7 @@ namespace Trinity
      * OperatorNew policy creates an object on the heap using new.
      */
     template <class T>
-        class TRINITY_DLL_DECL OperatorNew
+        class OperatorNew
     {
         public:
             static T* Create(void) { return (new T); }
@@ -42,7 +42,7 @@ namespace Trinity
      * the first time call Create.
      */
     template <class T>
-        class TRINITY_DLL_DECL LocalStaticCreation
+        class LocalStaticCreation
     {
         union MaxAlign
         {
@@ -71,7 +71,7 @@ namespace Trinity
      * CreateUsingMalloc by pass the memory manger.
      */
     template<class T>
-        class TRINITY_DLL_DECL CreateUsingMalloc
+        class CreateUsingMalloc
     {
         public:
             static T* Create()
@@ -92,7 +92,7 @@ namespace Trinity
      * CreateOnCallBack creates the object base on the call back.
      */
     template<class T, class CALL_BACK>
-        class TRINITY_DLL_DECL CreateOnCallBack
+        class CreateOnCallBack
     {
         public:
             static T* Create()
diff --git a/src/framework/Policies/ObjectLifeTime.cpp b/src/framework/Policies/ObjectLifeTime.cpp
index 7109961ffca..fd16873ae92 100644
--- a/src/framework/Policies/ObjectLifeTime.cpp
+++ b/src/framework/Policies/ObjectLifeTime.cpp
@@ -28,7 +28,7 @@ namespace Trinity
         std::atexit( (void (*)())p );
     }
 
-    void TRINITY_DLL_SPEC at_exit( void (*func)() )
+    void at_exit( void (*func)() )
     {
         external_wrapper((void*)func);
     }
diff --git a/src/framework/Policies/ObjectLifeTime.h b/src/framework/Policies/ObjectLifeTime.h
index 56806573c3a..61b90b59f6e 100644
--- a/src/framework/Policies/ObjectLifeTime.h
+++ b/src/framework/Policies/ObjectLifeTime.h
@@ -28,10 +28,10 @@ typedef void (* Destroyer)(void);
 
 namespace Trinity
 {
-    void TRINITY_DLL_SPEC at_exit( void (*func)() );
+    void at_exit( void (*func)() );
 
     template <class T>
-        class TRINITY_DLL_DECL ObjectLifeTime
+        class ObjectLifeTime
     {
         public:
             static void ScheduleCall(void (*destroyer)() )
diff --git a/src/framework/Policies/Singleton.h b/src/framework/Policies/Singleton.h
index ee27d40c8bb..da898558ca5 100644
--- a/src/framework/Policies/Singleton.h
+++ b/src/framework/Policies/Singleton.h
@@ -38,7 +38,7 @@ namespace Trinity
         class CreatePolicy = Trinity::OperatorNew<T>,
         class LifeTimePolicy = Trinity::ObjectLifeTime<T>
         >
-        class TRINITY_DLL_DECL Singleton
+        class Singleton
     {
         public:
             static T& Instance();
diff --git a/src/framework/Policies/SingletonImp.h b/src/framework/Policies/SingletonImp.h
index b969784bb25..3e985cd5c64 100644
--- a/src/framework/Policies/SingletonImp.h
+++ b/src/framework/Policies/SingletonImp.h
@@ -71,22 +71,22 @@ Trinity::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::DestroySing
 }
 
 #define INSTANTIATE_SINGLETON_1(TYPE) \
-    template class TRINITY_DLL_DECL Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >; \
+    template class Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >; \
     template<> TYPE* Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_instance = 0; \
     template<> bool Trinity::Singleton<TYPE, Trinity::SingleThreaded<TYPE>, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_destroyed = false
 
 #define INSTANTIATE_SINGLETON_2(TYPE, THREADINGMODEL) \
-    template class TRINITY_DLL_DECL Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >; \
+    template class Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >; \
     template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_instance = 0; \
     template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, Trinity::OperatorNew<TYPE>, Trinity::ObjectLifeTime<TYPE> >::si_destroyed = false
 
 #define INSTANTIATE_SINGLETON_3(TYPE, THREADINGMODEL, CREATIONPOLICY ) \
-    template class TRINITY_DLL_DECL Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeTime<TYPE> >; \
+    template class Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeTime<TYPE> >; \
     template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeTime<TYPE> >::si_instance = 0; \
     template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, Trinity::ObjectLifeType<TYPE> >::si_destroyed = false
 
 #define INSTANTIATE_SINGLETON_4(TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME) \
-    template class TRINITY_DLL_DECL Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >; \
+    template class Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >; \
     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 137c82d5178..d4c5e9a2333 100644
--- a/src/framework/Policies/ThreadingModel.h
+++ b/src/framework/Policies/ThreadingModel.h
@@ -32,7 +32,7 @@ namespace Trinity
 {
     inline void Guard(void *) {}
 
-    template<typename MUTEX> class TRINITY_DLL_DECL GeneralLock
+    template<typename MUTEX> class GeneralLock
     {
         public:
             GeneralLock(MUTEX &m) : i_mutex(m)
@@ -51,7 +51,7 @@ namespace Trinity
     };
 
     template <class T>
-        class TRINITY_DLL_DECL SingleThreaded
+        class SingleThreaded
     {
         public:
 
@@ -69,7 +69,7 @@ namespace Trinity
 
     // object level lockable
     template<class T, class MUTEX>
-        class TRINITY_DLL_DECL ObjectLevelLockable
+        class ObjectLevelLockable
     {
         public:
             ObjectLevelLockable() : i_mtx() {}
@@ -98,7 +98,7 @@ namespace Trinity
     };
 
     template<class T, class MUTEX>
-        class TRINITY_DLL_DECL ClassLevelLockable
+        class ClassLevelLockable
     {
         public:
             class Lock;
@@ -125,6 +125,6 @@ namespace Trinity
 template<class T, class MUTEX> MUTEX Trinity::ClassLevelLockable<T, MUTEX>::si_mtx;
 
 #define INSTANTIATE_CLASS_MUTEX(CTYPE,MUTEX) \
-    template class TRINITY_DLL_DECL Trinity::ClassLevelLockable<CTYPE, MUTEX >
+    template class Trinity::ClassLevelLockable<CTYPE, MUTEX >
 #endif
 
diff --git a/src/framework/Utilities/CountedReference/Reference.h b/src/framework/Utilities/CountedReference/Reference.h
index 5988a02673a..d3cfe55ffc0 100644
--- a/src/framework/Utilities/CountedReference/Reference.h
+++ b/src/framework/Utilities/CountedReference/Reference.h
@@ -42,7 +42,7 @@ template
 typename T,
 class THREADING_MODEL = Trinity::SingleThreaded<T>
 >
-class TRINITY_DLL_DECL Referencer
+class Referencer
 {
     typedef typename THREADING_MODEL::Lock Lock;
     typedef ReferenceHolder<T, THREADING_MODEL> ReferenceeHolder;