Merge remote-tracking branch 'origin/master' into mmaps

Conflicts:
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Spells/SpellEffects.cpp

1 files changed, 26 insertions, 26 deletions

diff --git a/src/server/shared/AutoPtr.h b/src/server/shared/AutoPtr.h
index f4199880abd..9afa05325c9 100644
--- a/src/server/shared/AutoPtr.h
+++ b/src/server/shared/AutoPtr.h
@@ -22,32 +22,32 @@
 
 namespace Trinity
 {
-    template <class Pointer, class Lock>
-    class AutoPtr : public ACE_Strong_Bound_Ptr<Pointer, Lock>
+
+template <class Pointer, class Lock>
+class AutoPtr : public ACE_Strong_Bound_Ptr<Pointer, Lock>
+{
+    typedef ACE_Strong_Bound_Ptr<Pointer, Lock> Base;
+
+public:
+    AutoPtr()
+        : Base()
+    { }
+
+    AutoPtr(Pointer* x)
+        : Base(x)
+    { }
+
+    operator bool() const
+    {
+        return !Base::null();
+    }
+
+    bool operator !() const
     {
-        public:
-            AutoPtr() : ACE_Strong_Bound_Ptr<Pointer, Lock>() {}
-
-            AutoPtr(Pointer* x)
-            {
-                ACE_Strong_Bound_Ptr<Pointer, Lock>::reset(x);
-            }
-
-            operator bool() const
-            {
-                return ACE_Strong_Bound_Ptr<Pointer, Lock>::get() != NULL;
-            }
-
-            bool operator !() const
-            {
-                return ACE_Strong_Bound_Ptr<Pointer, Lock>::get() == NULL;
-            }
-
-            bool operator !=(Pointer* x) const
-            {
-                return ACE_Strong_Bound_Ptr<Pointer, Lock>::get() != x;
-            }
-    };
-}
+        return Base::null();
+    }
+};
+
+} // namespace Trinity
 
 #endif