diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2010-04-08 04:53:33 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2010-04-08 04:53:33 +0000 |
| commit | bb69ac2090b9afb719ce4e4b9130226c34e591d9 (patch) | |
| tree | 8e652da48ace0561f19c429cfbfba1d6af0630b5 /qpid/cpp/include | |
| parent | 729bd42f4945c0636654c92979a8903fa972586f (diff) | |
| download | qpid-python-bb69ac2090b9afb719ce4e4b9130226c34e591d9.tar.gz | |
Changed the recent AbsTime::Epoch code to conform better to the previously
existing code.
Fixed AbsTime to compile on Windows again.
Removed unused and seemingly extraneous serialize() code from AbsTime.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@931782 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/include')
| -rw-r--r-- | qpid/cpp/include/qpid/sys/Time.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/cpp/include/qpid/sys/Time.h b/qpid/cpp/include/qpid/sys/Time.h index bd6fe87ec8..7c4bf75b8b 100644 --- a/qpid/cpp/include/qpid/sys/Time.h +++ b/qpid/cpp/include/qpid/sys/Time.h @@ -96,11 +96,10 @@ public: QPID_COMMON_EXTERN static AbsTime now(); QPID_COMMON_EXTERN static AbsTime FarFuture(); - QPID_COMMON_EXTERN static AbsTime epoch(); // The Unix epoch: 1970-01-01T00:00:00 + QPID_COMMON_EXTERN static AbsTime Epoch(); const TimePrivate& getPrivate(void) const { return timepoint; } bool operator==(const AbsTime& t) const { return t.timepoint == timepoint; } - template <class S> void serialize(S& s) { s(timepoint); } friend bool operator<(const AbsTime& a, const AbsTime& b); friend bool operator>(const AbsTime& a, const AbsTime& b); @@ -159,6 +158,9 @@ const Duration TIME_NSEC = 1; /** Value to represent an infinite timeout */ const Duration TIME_INFINITE = std::numeric_limits<int64_t>::max(); +/** Absolute time point for the Unix epoch: 1970-01-01T00:00:00 */ +const AbsTime EPOCH = AbsTime::Epoch(); + /** Time greater than any other time */ const AbsTime FAR_FUTURE = AbsTime::FarFuture(); |