From 44c0d66d63f58a022045efbb6cff6e1278f6a8cb Mon Sep 17 00:00:00 2001 From: DDuarte Date: Tue, 22 Jul 2014 13:12:03 +0100 Subject: Core/Misc: Remove a define that is no longer needed since ACE was removed --- src/server/game/Movement/Spline/MovementTypedefs.h | 2 -- src/server/shared/Utilities/ServiceWin32.cpp | 5 ----- src/tools/mmaps_generator/MapBuilder.h | 2 -- 3 files changed, 9 deletions(-) (limited to 'src') 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 #include -// 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 -- cgit v1.2.3