You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2010/03/30 22:02:35 UTC
svn commit: r929240 - in /qpid/trunk/qpid/cpp: examples/messaging/drain.cpp
include/qpid/messaging/Duration.h include/qpid/messaging/Receiver.h
include/qpid/messaging/Session.h src/qpid/messaging/Duration.cpp
src/tests/qpid_recv.cpp
Author: shuston
Date: Tue Mar 30 20:02:35 2010
New Revision: 929240
URL: http://svn.apache.org/viewvc?rev=929240&view=rev
Log:
Rename Duration::INFINITE to Duration::FOREVER; resolves QPID-2475.
Added missing QPID_CLIENT_EXTERN where needed in Duration class to build on Windows.
Modified:
qpid/trunk/qpid/cpp/examples/messaging/drain.cpp
qpid/trunk/qpid/cpp/include/qpid/messaging/Duration.h
qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h
qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h
qpid/trunk/qpid/cpp/src/qpid/messaging/Duration.cpp
qpid/trunk/qpid/cpp/src/tests/qpid_recv.cpp
Modified: qpid/trunk/qpid/cpp/examples/messaging/drain.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/messaging/drain.cpp?rev=929240&r1=929239&r2=929240&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/messaging/drain.cpp (original)
+++ qpid/trunk/qpid/cpp/examples/messaging/drain.cpp Tue Mar 30 20:02:35 2010
@@ -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;
}
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Duration.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Duration.h?rev=929240&r1=929239&r2=929240&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Duration.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Duration.h Tue Mar 30 20:02:35 2010
@@ -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
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h?rev=929240&r1=929239&r2=929240&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h Tue Mar 30 20:02:35 2010
@@ -53,7 +53,7 @@ class Receiver : public qpid::messaging:
* 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:
*@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:
* 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:
*@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
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h?rev=929240&r1=929239&r2=929240&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h Tue Mar 30 20:02:35 2010
@@ -102,7 +102,7 @@ class Session : public qpid::messaging::
* 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::
*@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
Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/Duration.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/Duration.cpp?rev=929240&r1=929239&r2=929240&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/Duration.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/Duration.cpp Tue Mar 30 20:02:35 2010
@@ -37,7 +37,7 @@ Duration operator*(uint64_t multiplier,
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);
Modified: qpid/trunk/qpid/cpp/src/tests/qpid_recv.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid_recv.cpp?rev=929240&r1=929239&r2=929240&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/qpid_recv.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid_recv.cpp Tue Mar 30 20:02:35 2010
@@ -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;
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org