From 333b8e5159ada2f1b8cbfd1dd8eb9072754477d7 Mon Sep 17 00:00:00 2001 From: Spp Date: Fri, 9 Nov 2012 13:13:45 +0100 Subject: Core/Build: Enable Clang PCH support and OS X specific features Core: Fix warnings here and there --- src/server/shared/AutoPtr.h | 52 ++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'src/server/shared/AutoPtr.h') 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 AutoPtr : public ACE_Strong_Bound_Ptr + +template +class AutoPtr : public ACE_Strong_Bound_Ptr +{ + typedef ACE_Strong_Bound_Ptr Base; + +public: + AutoPtr() + : Base() + { } + + AutoPtr(Pointer* x) + : Base(x) + { } + + operator bool() const + { + return !Base::null(); + } + + bool operator !() const { - public: - AutoPtr() : ACE_Strong_Bound_Ptr() {} - - AutoPtr(Pointer* x) - { - ACE_Strong_Bound_Ptr::reset(x); - } - - operator bool() const - { - return ACE_Strong_Bound_Ptr::get() != NULL; - } - - bool operator !() const - { - return ACE_Strong_Bound_Ptr::get() == NULL; - } - - bool operator !=(Pointer* x) const - { - return ACE_Strong_Bound_Ptr::get() != x; - } - }; -} + return Base::null(); + } +}; + +} // namespace Trinity #endif -- cgit v1.2.3