Author: gsim Date: Tue Jul 14 09:07:14 2009 New Revision: 793819 URL: http://svn.apache.org/viewvc?rev=793819&view=rev Log: Reapplied r793119
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp qpid/trunk/qpid/cpp/src/qpid/sys/DispatchHandle.h qpid/trunk/qpid/cpp/src/qpid/sys/Timer.h Modified: qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp?rev=793819&r1=793818&r2=793819&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp Tue Jul 14 09:07:14 2009 @@ -49,7 +49,7 @@ }; NullMessageStore::NullMessageStore() : nextPersistenceId(1) { - QPID_LOG(info, "No message store configured, persistence is disabled.") + QPID_LOG(info, "No message store configured, persistence is disabled."); } bool NullMessageStore::init(const Options* /*options*/) {return true;} Modified: qpid/trunk/qpid/cpp/src/qpid/sys/DispatchHandle.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/DispatchHandle.h?rev=793819&r1=793818&r2=793819&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/sys/DispatchHandle.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/sys/DispatchHandle.h Tue Jul 14 09:07:14 2009 @@ -38,14 +38,14 @@ * you need to: * * - Subclass IOHandle, in the constructor supply an appropriate - * IOHandlerPrivate object for the platform. - * + * IOHandlerPrivate object for the platform. + * * - Construct a DispatchHandle passing it your IOHandle and * callback functions for read, write and disconnect events. * * - Ensure the DispatchHandle is not deleted until the poller is no longer using it. * TODO: astitcher document DispatchHandleRef to simplify this. - * + * * When an event occurs on the handle, the poller calls the relevant callback and * stops watching that handle. Your callback can call rewatch() or related functions * to re-enable polling. Modified: qpid/trunk/qpid/cpp/src/qpid/sys/Timer.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/Timer.h?rev=793819&r1=793818&r2=793819&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/sys/Timer.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/sys/Timer.h Tue Jul 14 09:07:14 2009 @@ -71,7 +71,7 @@ const boost::intrusive_ptr<TimerTask>& b); class Timer : private Runnable { - qpid::sys::Monitor monitor; + qpid::sys::Monitor monitor; std::priority_queue<boost::intrusive_ptr<TimerTask> > tasks; qpid::sys::Thread runner; bool active; --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org