From 6c91609a8b9e6bf768a698afb1ea5ca380dcf361 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Thu, 8 Apr 2010 05:07:08 +0000 Subject: Remove some clunky accessors for AbsTime on Windows and replace by making Condition a friend class of AbsTime. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@931783 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/include/qpid/sys/Time.h | 2 +- qpid/cpp/include/qpid/sys/windows/Condition.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'qpid/cpp/include') diff --git a/qpid/cpp/include/qpid/sys/Time.h b/qpid/cpp/include/qpid/sys/Time.h index 7c4bf75b8b..f21a0d8c75 100644 --- a/qpid/cpp/include/qpid/sys/Time.h +++ b/qpid/cpp/include/qpid/sys/Time.h @@ -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); diff --git a/qpid/cpp/include/qpid/sys/windows/Condition.h b/qpid/cpp/include/qpid/sys/windows/Condition.h index 979fae9b0a..cd5aebbf09 100755 --- a/qpid/cpp/include/qpid/sys/windows/Condition.h +++ b/qpid/cpp/include/qpid/sys/windows/Condition.h @@ -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(){ -- cgit v1.2.1