Author: tschoening Date: Fri Feb 21 08:59:38 2014 New Revision: 1570493 URL: http://svn.apache.org/r1570493 Log: fixed indentation
Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h?rev=1570493&r1=1570492&r2=1570493&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h Fri Feb 21 08:59:38 2014 @@ -28,7 +28,7 @@ // switching between the initialization styles. // #if LOG4CXX_HELGRIND -#define _LOG4CXX_OBJECTPTR_INIT(x) : ObjectPtrBase() { exchange(x); +#define _LOG4CXX_OBJECTPTR_INIT(x) : ObjectPtrBase() { exchange(x); #else #define _LOG4CXX_OBJECTPTR_INIT(x) : ObjectPtrBase(), p(x) { #endif @@ -53,7 +53,7 @@ namespace log4cxx template<typename T> class ObjectPtrT : public ObjectPtrBase { public: - ObjectPtrT(const int& null) + ObjectPtrT(const int& null) _LOG4CXX_OBJECTPTR_INIT(0) ObjectPtrBase::checkNull(null); } @@ -79,14 +79,14 @@ namespace log4cxx } } - ObjectPtrT(const ObjectPtrBase& p1) + ObjectPtrT(const ObjectPtrBase& p1) _LOG4CXX_OBJECTPTR_INIT(reinterpret_cast<T*>(p1.cast(T::getStaticClass()))) if (this->p != 0) { this->p->addRef(); } } - ObjectPtrT(ObjectPtrBase& p1) + ObjectPtrT(ObjectPtrBase& p1) _LOG4CXX_OBJECTPTR_INIT(reinterpret_cast<T*>(p1.cast(T::getStaticClass()))) if (this->p != 0) { this->p->addRef(); @@ -150,10 +150,10 @@ namespace log4cxx bool operator==(const ObjectPtrT& p1) const { return (this->p == p1.p); } bool operator!=(const ObjectPtrT& p1) const { return (this->p != p1.p); } - bool operator<(const ObjectPtrT& p1) const { return (this->p < p1.p); } + bool operator<(const ObjectPtrT& p1) const { return (this->p < p1.p); } bool operator==(const T* p1) const { return (this->p == p1); } bool operator!=(const T* p1) const { return (this->p != p1); } - bool operator<(const T* p1) const { return (this->p < p1); } + bool operator<(const T* p1) const { return (this->p < p1); } T* operator->() const {return p; } T& operator*() const {return *p; } operator T*() const {return p; } @@ -175,7 +175,7 @@ namespace log4cxx void** out; } temp = { &p }; return static_cast<T*>(ObjectPtrBase::exchange( - temp.out, + temp.out, const_cast<T*>(newValue))); }