diff options
| author | Stephen D. Huston <shuston@apache.org> | 2010-03-30 20:02:35 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2010-03-30 20:02:35 +0000 |
| commit | 7b39205d3938dcdf87e78d99caa7d69f02212bf8 (patch) | |
| tree | c3c7497adfd0a1f8fc4ba32abd2a1bef3a010c4f /qpid/cpp/src | |
| parent | 287a79cabf8f2931257fbbf78f1f19de12efc5f2 (diff) | |
| download | qpid-python-7b39205d3938dcdf87e78d99caa7d69f02212bf8.tar.gz | |
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@929240 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/messaging/Duration.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/qpid_recv.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/messaging/Duration.cpp b/qpid/cpp/src/qpid/messaging/Duration.cpp index c415b70fbe..a2c443c746 100644 --- a/qpid/cpp/src/qpid/messaging/Duration.cpp +++ b/qpid/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<uint64_t>::max()); +const Duration Duration::FOREVER(std::numeric_limits<uint64_t>::max()); const Duration Duration::IMMEDIATE(0); const Duration Duration::SECOND(1000); const Duration Duration::MINUTE(SECOND * 60); diff --git a/qpid/cpp/src/tests/qpid_recv.cpp b/qpid/cpp/src/tests/qpid_recv.cpp index 6e384e9672..0a268ad6cf 100644 --- a/qpid/cpp/src/tests/qpid_recv.cpp +++ b/qpid/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; } |