You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2010/04/08 07:07:08 UTC
svn commit: r931783 - in /qpid/trunk/qpid/cpp: include/qpid/sys/Time.h
include/qpid/sys/windows/Condition.h src/qpid/sys/windows/Time.cpp
Author: astitcher
Date: Thu Apr 8 05:07:08 2010
New Revision: 931783
URL: http://svn.apache.org/viewvc?rev=931783&view=rev
Log:
Remove some clunky accessors for AbsTime on Windows and replace by making Condition
a friend class of AbsTime.
Modified:
qpid/trunk/qpid/cpp/include/qpid/sys/Time.h
qpid/trunk/qpid/cpp/include/qpid/sys/windows/Condition.h
qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
Modified: qpid/trunk/qpid/cpp/include/qpid/sys/Time.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/Time.h?rev=931783&r1=931782&r2=931783&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/sys/Time.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/Time.h Thu Apr 8 05:07:08 2010
@@ -84,6 +84,7 @@ class Duration;
*/
class AbsTime {
friend class Duration;
+ friend class Condition;
TimePrivate timepoint;
@@ -98,7 +99,6 @@ public:
QPID_COMMON_EXTERN static AbsTime FarFuture();
QPID_COMMON_EXTERN static AbsTime Epoch();
- const TimePrivate& getPrivate(void) const { return timepoint; }
bool operator==(const AbsTime& t) const { return t.timepoint == timepoint; }
friend bool operator<(const AbsTime& a, const AbsTime& b);
Modified: qpid/trunk/qpid/cpp/include/qpid/sys/windows/Condition.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/windows/Condition.h?rev=931783&r1=931782&r2=931783&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/sys/windows/Condition.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/windows/Condition.h Thu Apr 8 05:07:08 2010
@@ -34,9 +34,6 @@
namespace qpid {
namespace sys {
-// Private Time related implementation details
-void toPtime(boost::posix_time::ptime& pt, const AbsTime& t);
-
/**
* A condition variable for thread synchronization.
*/
@@ -65,7 +62,7 @@ void Condition::wait(Mutex& mutex) {
}
bool Condition::wait(Mutex& mutex, const AbsTime& absoluteTime){
- return condition.timed_wait(mutex.mutex, absoluteTime.getPrivate());
+ return condition.timed_wait(mutex.mutex, absoluteTime.timepoint);
}
void Condition::notify(){
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp?rev=931783&r1=931782&r2=931783&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp Thu Apr 8 05:07:08 2010
@@ -79,10 +79,6 @@ std::ostream& operator<<(std::ostream& o
}
-void toPtime(ptime& pt, const AbsTime& t) {
- pt = t.getPrivate();
-}
-
void sleep(int secs) {
::Sleep(secs * 1000);
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org