Author: afester Date: Mon May 14 09:46:09 2007 New Revision: 537906 URL: http://svn.apache.org/viewvc?view=rev&rev=537906 Log: LOGCXX-14: Made member variables non-const to avoid "cast to non-const" warning
Modified: logging/log4cxx/trunk/include/log4cxx/helpers/condition.h logging/log4cxx/trunk/include/log4cxx/helpers/mutex.h logging/log4cxx/trunk/include/log4cxx/helpers/synchronized.h logging/log4cxx/trunk/src/mutex.cpp Modified: logging/log4cxx/trunk/include/log4cxx/helpers/condition.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/condition.h?view=diff&rev=537906&r1=537905&r2=537906 ============================================================================== --- logging/log4cxx/trunk/include/log4cxx/helpers/condition.h (original) +++ logging/log4cxx/trunk/include/log4cxx/helpers/condition.h Mon May 14 09:46:09 2007 @@ -36,8 +36,8 @@ void wait(); private: - const void* condition; - const void* mutex; + void* condition; + void* mutex; Condition(const Condition&); Condition& operator=(const Condition&); }; Modified: logging/log4cxx/trunk/include/log4cxx/helpers/mutex.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/mutex.h?view=diff&rev=537906&r1=537905&r2=537906 ============================================================================== --- logging/log4cxx/trunk/include/log4cxx/helpers/mutex.h (original) +++ logging/log4cxx/trunk/include/log4cxx/helpers/mutex.h Mon May 14 09:46:09 2007 @@ -33,12 +33,12 @@ public: Mutex(log4cxx::helpers::Pool& p); ~Mutex(); - const log4cxx_thread_mutex_t* getAPRMutex() const; + log4cxx_thread_mutex_t* getAPRMutex() const; private: Mutex(const Mutex&); Mutex& operator=(const Mutex&); - const log4cxx_thread_mutex_t* mutex; + log4cxx_thread_mutex_t* mutex; }; } // namespace helpers } // namespace log4cxx Modified: logging/log4cxx/trunk/include/log4cxx/helpers/synchronized.h URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/synchronized.h?view=diff&rev=537906&r1=537905&r2=537906 ============================================================================== --- logging/log4cxx/trunk/include/log4cxx/helpers/synchronized.h (original) +++ logging/log4cxx/trunk/include/log4cxx/helpers/synchronized.h Mon May 14 09:46:09 2007 @@ -33,7 +33,7 @@ private: - const void* mutex; + void* mutex; // prevent use of copy and assignment synchronized(const synchronized&); synchronized& operator=(const synchronized&); Modified: logging/log4cxx/trunk/src/mutex.cpp URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/mutex.cpp?view=diff&rev=537906&r1=537905&r2=537906 ============================================================================== --- logging/log4cxx/trunk/src/mutex.cpp (original) +++ logging/log4cxx/trunk/src/mutex.cpp Mon May 14 09:46:09 2007 @@ -45,6 +45,6 @@ #endif } -const log4cxx_thread_mutex_t* Mutex::getAPRMutex() const { +log4cxx_thread_mutex_t* Mutex::getAPRMutex() const { return mutex; }