diff options
author | DDuarte <dnpd.dd@gmail.com> | 2014-07-22 13:12:03 +0100 |
---|---|---|
committer | DDuarte <dnpd.dd@gmail.com> | 2014-07-22 13:12:39 +0100 |
commit | 44c0d66d63f58a022045efbb6cff6e1278f6a8cb (patch) | |
tree | 09296b7733023d4c245c57221a67012a60e22c8c | |
parent | 1b6ac4ac3a3af494d618f7e4ed3a5439877f80c7 (diff) |
Core/Misc: Remove a define that is no longer needed since ACE was removed
-rw-r--r-- | src/server/game/Movement/Spline/MovementTypedefs.h | 2 | ||||
-rw-r--r-- | src/server/shared/Utilities/ServiceWin32.cpp | 5 | ||||
-rw-r--r-- | src/tools/mmaps_generator/MapBuilder.h | 2 |
3 files changed, 0 insertions, 9 deletions
diff --git a/src/server/game/Movement/Spline/MovementTypedefs.h b/src/server/game/Movement/Spline/MovementTypedefs.h index 22850036b61..635c43757be 100644 --- a/src/server/game/Movement/Spline/MovementTypedefs.h +++ b/src/server/game/Movement/Spline/MovementTypedefs.h @@ -23,14 +23,12 @@ namespace G3D { - class Vector2; class Vector3; class Vector4; } namespace Movement { - using G3D::Vector2; using G3D::Vector3; using G3D::Vector4; diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp index f4a0339d9e6..ecf403423f7 100644 --- a/src/server/shared/Utilities/ServiceWin32.cpp +++ b/src/server/shared/Utilities/ServiceWin32.cpp @@ -24,11 +24,6 @@ #include <windows.h> #include <winsvc.h> -// stupid ACE define -#ifdef main -#undef main -#endif //main - #if !defined(WINADVAPI) #if !defined(_ADVAPI32_) #define WINADVAPI DECLSPEC_IMPORT diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h index 944d03968b5..1d688ccfa77 100644 --- a/src/tools/mmaps_generator/MapBuilder.h +++ b/src/tools/mmaps_generator/MapBuilder.h @@ -35,8 +35,6 @@ using namespace VMAP; -// G3D namespace typedefs conflicts with ACE typedefs - namespace MMAP { struct MapTiles |