From e87e7af34a950629ccdbfefda73789b23ea9c0ff Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Tue, 30 Mar 2010 20:02:35 +0000 Subject: Rename Duration::INFINITE to Duration::FOREVER; resolves QPID-2475. Added missing QPID_CLIENT_EXTERN where needed in Duration class to build on Windows. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@929240 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/messaging/Duration.cpp | 2 +- cpp/src/tests/qpid_recv.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cpp/src') diff --git a/cpp/src/qpid/messaging/Duration.cpp b/cpp/src/qpid/messaging/Duration.cpp index c415b70fbe..a2c443c746 100644 --- a/cpp/src/qpid/messaging/Duration.cpp +++ b/cpp/src/qpid/messaging/Duration.cpp @@ -37,7 +37,7 @@ Duration operator*(uint64_t multiplier, const Duration& duration) return Duration(duration.getMilliseconds() * multiplier); } -const Duration Duration::INFINITE(std::numeric_limits::max()); +const Duration Duration::FOREVER(std::numeric_limits::max()); const Duration Duration::IMMEDIATE(0); const Duration Duration::SECOND(1000); const Duration Duration::MINUTE(SECOND * 60); diff --git a/cpp/src/tests/qpid_recv.cpp b/cpp/src/tests/qpid_recv.cpp index 6e384e9672..0a268ad6cf 100644 --- a/cpp/src/tests/qpid_recv.cpp +++ b/cpp/src/tests/qpid_recv.cpp @@ -96,7 +96,7 @@ struct Options : public qpid::Options Duration getTimeout() { - if (forever) return Duration::INFINITE; + if (forever) return Duration::FOREVER; else return Duration::SECOND*timeout; } -- cgit v1.2.1