Remove MANGOS_DLL_DECL and its use

This define is always empty and therefore useless. See cmangos/issues#402 for details. Signed-off-by: stfx <stfx@hotmail.de>
cmangos · Dec 1, 2014 · 5267ab5 · 5267ab5 · xfurry · Feb 27, 2015
1 parent f4b2204
commit 5267ab5
Show file tree

Hide file tree

Showing 30 changed files with 76 additions and 90 deletions.
diff --git a/src/bindings/universal/ScriptMgr.h b/src/bindings/universal/ScriptMgr.h
@@ -85,7 +85,7 @@ struct Script
 #define VISIBLE_RANGE (50.0f)
 
 // Read function descriptions in CreatureAI
-struct MANGOS_DLL_DECL ScriptedAI : public CreatureAI
+struct ScriptedAI : public CreatureAI
 {
     explicit ScriptedAI(Creature* creature) : CreatureAI(creature) {}
     ~ScriptedAI() {}

diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/framework/Dynamic/FactoryHolder.h
@@ -27,7 +27,7 @@
 /** FactoryHolder holds a factory object of a specific type
  */
 template<class T, class Key = std::string>
-class MANGOS_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
@@ -30,7 +30,7 @@
 /** ObjectRegistry holds all registry item of the same type
  */
 template<class T, class Key = std::string>
-class MANGOS_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
@@ -44,7 +44,7 @@ class ACTIVE_OBJECT,
       class WORLD_OBJECT_TYPES,
       class GRID_OBJECT_TYPES
       >
-class MANGOS_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
@@ -40,7 +40,7 @@ class ACTIVE_OBJECT,
       class WORLD_OBJECT_TYPES,
       class GRID_OBJECT_TYPES
       >
-class MANGOS_DLL_DECL GridLoader
+class GridLoader
 {
     public:
 

diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h
@@ -80,7 +80,7 @@ uint32 N,
        class WORLD_OBJECT_TYPES,
        class GRID_OBJECT_TYPES
        >
-class MANGOS_DLL_DECL NGrid
+class NGrid
 {
     public:
 

diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h
@@ -206,7 +206,7 @@ struct ContainerMapList<TypeList<H, T> >
  */
 
 template<class OBJECT_TYPES>
-class MANGOS_DLL_DECL TypeMapContainer
+class TypeMapContainer
 {
     public:
 

diff --git a/src/framework/GameSystem/TypeContainerVisitor.h b/src/framework/GameSystem/TypeContainerVisitor.h
@@ -66,7 +66,7 @@ void VisitorHelper(VISITOR& v, TypeMapContainer<OBJECT_TYPES>& c)
 }
 
 template<class VISITOR, class TYPE_CONTAINER>
-class MANGOS_DLL_DECL TypeContainerVisitor
+class TypeContainerVisitor
 {
     public:
 

diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h
@@ -64,20 +64,6 @@ typedef ACE_SHLIB_HANDLE MANGOS_LIBRARY_HANDLE;
 #  endif //__APPLE_CC__ && BIG_ENDIAN
 #endif // PLATFORM
 
-#if PLATFORM == PLATFORM_WINDOWS
-#  ifdef MANGOS_WIN32_DLL_IMPORT
-#    define MANGOS_DLL_DECL __declspec(dllimport)
-#  else //!MANGOS_WIN32_DLL_IMPORT
-#    ifdef MANGOS_WIND_DLL_EXPORT
-#      define MANGOS_DLL_DECL __declspec(dllexport)
-#    else //!MANGOS_WIND_DLL_EXPORT
-#      define MANGOS_DLL_DECL
-#    endif // MANGOS_WIND_DLL_EXPORT
-#  endif // MANGOS_WIN32_DLL_IMPORT
-#else // PLATFORM != PLATFORM_WINDOWS
-#  define MANGOS_DLL_DECL
-#endif // PLATFORM
-
 #if PLATFORM == PLATFORM_WINDOWS
 #  define MANGOS_DLL_SPEC __declspec(dllexport)
 #  ifndef DECLSPEC_NORETURN

diff --git a/src/framework/Policies/CreationPolicy.h b/src/framework/Policies/CreationPolicy.h
@@ -28,7 +28,7 @@ namespace MaNGOS
      * OperatorNew policy creates an object on the heap using new.
      */
     template<class T>
-    class MANGOS_DLL_DECL OperatorNew
+    class OperatorNew
     {
         public:
 
@@ -48,7 +48,7 @@ namespace MaNGOS
      * the first time call Create.
      */
     template<class T>
-    class MANGOS_DLL_DECL LocalStaticCreation
+    class LocalStaticCreation
     {
             union MaxAlign
             {
@@ -82,7 +82,7 @@ namespace MaNGOS
      * CreateUsingMalloc by pass the memory manger.
      */
     template<class T>
-    class MANGOS_DLL_DECL CreateUsingMalloc
+    class CreateUsingMalloc
     {
         public:
 
@@ -107,7 +107,7 @@ namespace MaNGOS
      * CreateOnCallBack creates the object base on the call back.
      */
     template<class T, class CALL_BACK>
-    class MANGOS_DLL_DECL CreateOnCallBack
+    class CreateOnCallBack
     {
         public:
             static T* Create()

diff --git a/src/framework/Policies/ObjectLifeTime.h b/src/framework/Policies/ObjectLifeTime.h
@@ -29,7 +29,7 @@ namespace MaNGOS
     void MANGOS_DLL_SPEC at_exit(void (*func)());
 
     template<class T>
-    class MANGOS_DLL_DECL ObjectLifeTime
+    class ObjectLifeTime
     {
         public:
 

diff --git a/src/framework/Policies/Singleton.h b/src/framework/Policies/Singleton.h
@@ -36,7 +36,7 @@ namespace MaNGOS
              class CreatePolicy = MaNGOS::OperatorNew<T>,
              class LifeTimePolicy = MaNGOS::ObjectLifeTime<T>
              >
-    class MANGOS_DLL_DECL Singleton
+    class Singleton
     {
         public:
 
@@ -103,15 +103,15 @@ namespace MaNGOS
 }
 
 #define INSTANTIATE_SINGLETON_1(TYPE) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
+    template class MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
 
 #define INSTANTIATE_SINGLETON_2(TYPE, THREADINGMODEL) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
+    template class MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
 
 #define INSTANTIATE_SINGLETON_3(TYPE, THREADINGMODEL, CREATIONPOLICY ) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeTime<TYPE> >;
+    template class MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeTime<TYPE> >;
 
 #define INSTANTIATE_SINGLETON_4(TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >;
+    template class MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >;
 
 #endif
diff --git a/src/framework/Policies/ThreadingModel.h b/src/framework/Policies/ThreadingModel.h
@@ -29,7 +29,7 @@
 namespace MaNGOS
 {
     template<typename MUTEX>
-    class MANGOS_DLL_DECL GeneralLock
+    class GeneralLock
     {
         public:
 
@@ -52,7 +52,7 @@ namespace MaNGOS
     };
 
     template<class T>
-    class MANGOS_DLL_DECL SingleThreaded
+    class SingleThreaded
     {
         public:
 
@@ -72,7 +72,7 @@ namespace MaNGOS
     };
 
     template<class T, class MUTEX>
-    class MANGOS_DLL_DECL ObjectLevelLockable
+    class ObjectLevelLockable
     {
         public:
 
@@ -107,7 +107,7 @@ namespace MaNGOS
     };
 
     template<class T, class MUTEX>
-    class MANGOS_DLL_DECL ClassLevelLockable
+    class ClassLevelLockable
     {
         public:
 
@@ -151,6 +151,6 @@ namespace MaNGOS
 template<class T, class MUTEX> MUTEX MaNGOS::ClassLevelLockable<T, MUTEX>::si_mtx;
 
 #define INSTANTIATE_CLASS_MUTEX(CTYPE, MUTEX) \
-    template class MANGOS_DLL_DECL MaNGOS::ClassLevelLockable<CTYPE, MUTEX>
+    template class MaNGOS::ClassLevelLockable<CTYPE, MUTEX>
 
 #endif
diff --git a/src/game/AggressorAI.h b/src/game/AggressorAI.h
@@ -25,7 +25,7 @@
 
 class Creature;
 
-class MANGOS_DLL_DECL AggressorAI : public CreatureAI
+class AggressorAI : public CreatureAI
 {
         enum AggressorState
         {

diff --git a/src/game/Cell.h b/src/game/Cell.h
@@ -27,7 +27,7 @@
 class Map;
 class WorldObject;
 
-struct MANGOS_DLL_DECL CellArea
+struct CellArea
 {
     CellArea() {}
     CellArea(CellPair low, CellPair high) : low_bound(low), high_bound(high) {}
@@ -44,7 +44,7 @@ struct MANGOS_DLL_DECL CellArea
     CellPair high_bound;
 };
 
-struct MANGOS_DLL_DECL Cell
+struct Cell
 {
         Cell() { data.All = 0; }
         Cell(const Cell& cell) { data.All = cell.data.All; }

diff --git a/src/game/GridDefines.h b/src/game/GridDefines.h
@@ -75,7 +75,7 @@ typedef TypeMapContainer<AllGridObjectTypes> GridTypeMapContainer;
 typedef TypeMapContainer<AllWorldObjectTypes> WorldTypeMapContainer;
 
 template<const unsigned int LIMIT>
-struct MANGOS_DLL_DECL CoordPair
+struct CoordPair
 {
     CoordPair(uint32 x = 0, uint32 y = 0) : x_coord(x), y_coord(y) {}
     CoordPair(const CoordPair<LIMIT>& obj) : x_coord(obj.x_coord), y_coord(obj.y_coord) {}

diff --git a/src/game/GridMap.h b/src/game/GridMap.h
@@ -275,7 +275,7 @@ class MANGOS_DLL_SPEC TerrainInfo : public Referencable<AtomicLong>
 };
 
 // class for managing TerrainData object and all sort of geometry querying operations
-class MANGOS_DLL_DECL TerrainManager : public MaNGOS::Singleton<TerrainManager, MaNGOS::ClassLevelLockable<TerrainManager, ACE_Thread_Mutex> >
+class TerrainManager : public MaNGOS::Singleton<TerrainManager, MaNGOS::ClassLevelLockable<TerrainManager, ACE_Thread_Mutex> >
 {
         typedef UNORDERED_MAP<uint32,  TerrainInfo*> TerrainDataMap;
         friend class MaNGOS::OperatorNew<TerrainManager>;