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/src/tests | |
| 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/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/Statistics.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/qpid_send.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/Statistics.cpp b/qpid/cpp/src/tests/Statistics.cpp index 09286e3298..3c5a3a6d4e 100644 --- a/qpid/cpp/src/tests/Statistics.cpp +++ b/qpid/cpp/src/tests/Statistics.cpp @@ -57,7 +57,7 @@ void ThroughputAndLatency::message(const messaging::Message& m) { types::Variant::Map::const_iterator i = m.getProperties().find("ts"); if (i != m.getProperties().end()) { int64_t start(i->second.asInt64()); - int64_t end(sys::Duration(sys::AbsTime::epoch(),sys::now())); + int64_t end(sys::Duration(sys::EPOCH, sys::now())); double latency = double(end - start)/sys::TIME_MSEC; if (latency > 0) { total += latency; diff --git a/qpid/cpp/src/tests/qpid_send.cpp b/qpid/cpp/src/tests/qpid_send.cpp index 26e9003b2d..feeabefbdd 100644 --- a/qpid/cpp/src/tests/qpid_send.cpp +++ b/qpid/cpp/src/tests/qpid_send.cpp @@ -251,7 +251,7 @@ int main(int argc, char ** argv) msg.setContent(content); msg.getProperties()["sn"] = ++sent; msg.getProperties()["ts"] = int64_t( - qpid::sys::Duration(qpid::sys::AbsTime::epoch(), qpid::sys::now())); + qpid::sys::Duration(qpid::sys::EPOCH, qpid::sys::now())); sender.send(msg); reporter.message(msg); if (opts.tx && (sent % opts.tx == 0)) { |