diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/examples/messaging/drain.cpp | 2 | ||||
| -rw-r--r-- | cpp/include/qpid/messaging/Duration.h | 20 | ||||
| -rw-r--r-- | cpp/include/qpid/messaging/Receiver.h | 8 | ||||
| -rw-r--r-- | cpp/include/qpid/messaging/Session.h | 4 | ||||
| -rw-r--r-- | cpp/src/qpid/messaging/Duration.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/tests/qpid_recv.cpp | 2 |
6 files changed, 21 insertions, 17 deletions
diff --git a/cpp/examples/messaging/drain.cpp b/cpp/examples/messaging/drain.cpp index a2bb1c9d3a..a2fa0f1138 100644 --- a/cpp/examples/messaging/drain.cpp +++ b/cpp/examples/messaging/drain.cpp @@ -64,7 +64,7 @@ struct Options : public qpid::Options Duration getTimeout() { - if (forever) return Duration::INFINITE; + if (forever) return Duration::FOREVER; else return timeout*Duration::SECOND; } diff --git a/cpp/include/qpid/messaging/Duration.h b/cpp/include/qpid/messaging/Duration.h index a127e86f29..fdd1cf4a50 100644 --- a/cpp/include/qpid/messaging/Duration.h +++ b/cpp/include/qpid/messaging/Duration.h @@ -21,6 +21,8 @@ * under the License. * */ + +#include "qpid/client/ClientImportExport.h" #include "qpid/sys/IntegerTypes.h" namespace qpid { @@ -32,18 +34,20 @@ namespace messaging { class Duration { public: - explicit Duration(uint64_t milliseconds); - uint64_t getMilliseconds() const; - static const Duration INFINITE; - static const Duration IMMEDIATE; - static const Duration SECOND; - static const Duration MINUTE; + QPID_CLIENT_EXTERN explicit Duration(uint64_t milliseconds); + QPID_CLIENT_EXTERN uint64_t getMilliseconds() const; + QPID_CLIENT_EXTERN static const Duration FOREVER; + QPID_CLIENT_EXTERN static const Duration IMMEDIATE; + QPID_CLIENT_EXTERN static const Duration SECOND; + QPID_CLIENT_EXTERN static const Duration MINUTE; private: uint64_t milliseconds; }; -Duration operator*(const Duration& duration, uint64_t multiplier); -Duration operator*(uint64_t multiplier, const Duration& duration); +QPID_CLIENT_EXTERN Duration operator*(const Duration& duration, + uint64_t multiplier); +QPID_CLIENT_EXTERN Duration operator*(uint64_t multiplier, + const Duration& duration); }} // namespace qpid::messaging diff --git a/cpp/include/qpid/messaging/Receiver.h b/cpp/include/qpid/messaging/Receiver.h index f0b9a7d66e..48b0b78754 100644 --- a/cpp/include/qpid/messaging/Receiver.h +++ b/cpp/include/qpid/messaging/Receiver.h @@ -53,7 +53,7 @@ class Receiver : public qpid::messaging::Handle<ReceiverImpl> * available. Returns false if there is no message to give after * waiting for the specified timeout. */ - QPID_CLIENT_EXTERN bool get(Message& message, Duration timeout=Duration::INFINITE); + QPID_CLIENT_EXTERN bool get(Message& message, Duration timeout=Duration::FOREVER); /** * Retrieves a message from this receivers local queue, or waits * for up to the specified timeout for a message to become @@ -62,7 +62,7 @@ class Receiver : public qpid::messaging::Handle<ReceiverImpl> *@exception NoMessageAvailable if there is no message to give * after waiting for the specified timeout. */ - QPID_CLIENT_EXTERN Message get(Duration timeout=Duration::INFINITE); + QPID_CLIENT_EXTERN Message get(Duration timeout=Duration::FOREVER); /** * Retrieves a message for this receivers subscription or waits * for up to the specified timeout for one to become @@ -70,7 +70,7 @@ class Receiver : public qpid::messaging::Handle<ReceiverImpl> * that there is no message for the subscription this receiver is * serving before returning false. */ - QPID_CLIENT_EXTERN bool fetch(Message& message, Duration timeout=Duration::INFINITE); + QPID_CLIENT_EXTERN bool fetch(Message& message, Duration timeout=Duration::FOREVER); /** * Retrieves a message for this receivers subscription or waits * for up to the specified timeout for one to become @@ -81,7 +81,7 @@ class Receiver : public qpid::messaging::Handle<ReceiverImpl> *@exception NoMessageAvailable if there is no message to give * after waiting for the specified timeout. */ - QPID_CLIENT_EXTERN Message fetch(Duration timeout=Duration::INFINITE); + QPID_CLIENT_EXTERN Message fetch(Duration timeout=Duration::FOREVER); /** * Sets the capacity for the receiver. The capacity determines how * many incoming messages can be held in the receiver before being diff --git a/cpp/include/qpid/messaging/Session.h b/cpp/include/qpid/messaging/Session.h index bc5aaed6ba..eaecb69260 100644 --- a/cpp/include/qpid/messaging/Session.h +++ b/cpp/include/qpid/messaging/Session.h @@ -102,7 +102,7 @@ class Session : public qpid::messaging::Handle<SessionImpl> * which case the passed in receiver reference will be set to the * receiver for that message or false if no message was available. */ - QPID_CLIENT_EXTERN bool nextReceiver(Receiver&, Duration timeout=Duration::INFINITE); + QPID_CLIENT_EXTERN bool nextReceiver(Receiver&, Duration timeout=Duration::FOREVER); /** * Returns the receiver for the next available message. If there * are no available messages at present the call will block for up @@ -111,7 +111,7 @@ class Session : public qpid::messaging::Handle<SessionImpl> *@exception Receiver::NoMessageAvailable if no message became available in * time. */ - QPID_CLIENT_EXTERN Receiver nextReceiver(Duration timeout=Duration::INFINITE); + QPID_CLIENT_EXTERN Receiver nextReceiver(Duration timeout=Duration::FOREVER); /** * Create a new sender through which messages can be sent to the 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<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/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; } |