diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-05 16:55:17 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-05 16:55:17 +0100 |
| commit | 24e0eb1812f94c5092009f78ced3306f142d2789 (patch) | |
| tree | 0118c5abc4e0bb3e8e2a218ca2c9c1934f8eb0d1 /src/server/worldserver | |
| parent | 8db66bfefdb9ec7a722dd93aadbbd818c567fba0 (diff) | |
| parent | 7dd0cd4403d7f28343a751e7b85aeb30d3968ff5 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/Spline/MoveSplineInit.cpp
Diffstat (limited to 'src/server/worldserver')
| -rw-r--r-- | src/server/worldserver/RemoteAccess/RARunnable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/worldserver/RemoteAccess/RARunnable.cpp b/src/server/worldserver/RemoteAccess/RARunnable.cpp index e64e8d03115..8d57ef6c3b2 100644 --- a/src/server/worldserver/RemoteAccess/RARunnable.cpp +++ b/src/server/worldserver/RemoteAccess/RARunnable.cpp @@ -35,7 +35,7 @@ RARunnable::RARunnable() { - ACE_Reactor_Impl* imp = NULL; + ACE_Reactor_Impl* imp; #if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL) imp = new ACE_Dev_Poll_Reactor(); |