summaryrefslogtreecommitdiff
path: root/cpp/lib/client
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/lib/client')
-rw-r--r--cpp/lib/client/Basic.cpp10
-rw-r--r--cpp/lib/client/Basic.h2
-rw-r--r--cpp/lib/client/ClientChannel.cpp8
-rw-r--r--cpp/lib/client/ClientChannel.h8
-rw-r--r--cpp/lib/client/ClientMessage.cpp14
-rw-r--r--cpp/lib/client/ClientMessage.h14
-rw-r--r--cpp/lib/client/Connection.cpp2
-rw-r--r--cpp/lib/client/Connection.h6
-rw-r--r--cpp/lib/client/Connector.cpp6
-rw-r--r--cpp/lib/client/Connector.h10
-rw-r--r--cpp/lib/client/MethodBodyInstances.h2
11 files changed, 41 insertions, 41 deletions
diff --git a/cpp/lib/client/Basic.cpp b/cpp/lib/client/Basic.cpp
index 88d46541f4..4a1cf249a8 100644
--- a/cpp/lib/client/Basic.cpp
+++ b/cpp/lib/client/Basic.cpp
@@ -123,17 +123,17 @@ void Basic::publish(
//break msg up into header frame and content frame(s) and send these
channel.send(msg.getHeader());
string data = msg.getData();
- u_int64_t data_length = data.length();
+ uint64_t data_length = data.length();
if(data_length > 0){
//frame itself uses 8 bytes
- u_int32_t frag_size = channel.connection->getMaxFrameSize() - 8;
+ uint32_t frag_size = channel.connection->getMaxFrameSize() - 8;
if(data_length < frag_size){
channel.send(new AMQContentBody(data));
}else{
- u_int32_t offset = 0;
- u_int32_t remaining = data_length - offset;
+ uint32_t offset = 0;
+ uint32_t remaining = data_length - offset;
while (remaining > 0) {
- u_int32_t length = remaining > frag_size ? frag_size : remaining;
+ uint32_t length = remaining > frag_size ? frag_size : remaining;
string frag(data.substr(offset, length));
channel.send(new AMQContentBody(frag));
diff --git a/cpp/lib/client/Basic.h b/cpp/lib/client/Basic.h
index e598f5555b..f6ae633ab8 100644
--- a/cpp/lib/client/Basic.h
+++ b/cpp/lib/client/Basic.h
@@ -168,7 +168,7 @@ class Basic : public sys::Runnable
MessageListener* listener;
AckMode ackMode;
int count;
- u_int64_t lastDeliveryTag;
+ uint64_t lastDeliveryTag;
};
typedef std::map<std::string, Consumer> ConsumerMap;
diff --git a/cpp/lib/client/ClientChannel.cpp b/cpp/lib/client/ClientChannel.cpp
index 24f21d1a30..84aa73e6bc 100644
--- a/cpp/lib/client/ClientChannel.cpp
+++ b/cpp/lib/client/ClientChannel.cpp
@@ -36,7 +36,7 @@ using namespace qpid::client;
using namespace qpid::framing;
using namespace qpid::sys;
-Channel::Channel(bool _transactional, u_int16_t _prefetch) :
+Channel::Channel(bool _transactional, uint16_t _prefetch) :
basic(*this),
connection(0),
prefetch(_prefetch),
@@ -87,7 +87,7 @@ void Channel::protocolInit(
version, responses.getRequestId(), proposal->getChannelMax(), connection->getMaxFrameSize(),
proposal->getHeartbeat()));
- u_int16_t heartbeat = proposal->getHeartbeat();
+ uint16_t heartbeat = proposal->getHeartbeat();
connection->connector->setReadTimeout(heartbeat * 2);
connection->connector->setWriteTimeout(heartbeat);
@@ -119,7 +119,7 @@ void Channel::setQos() {
// FIXME aconway 2007-02-22: message
}
-void Channel::setPrefetch(u_int16_t _prefetch){
+void Channel::setPrefetch(uint16_t _prefetch){
prefetch = _prefetch;
setQos();
}
@@ -243,7 +243,7 @@ void Channel::start(){
// Close called by local application.
void Channel::close(
- u_int16_t code, const std::string& text,
+ uint16_t code, const std::string& text,
ClassId classId, MethodId methodId)
{
if (isOpen()) {
diff --git a/cpp/lib/client/ClientChannel.h b/cpp/lib/client/ClientChannel.h
index 56fdd57d03..3ecab05d0b 100644
--- a/cpp/lib/client/ClientChannel.h
+++ b/cpp/lib/client/ClientChannel.h
@@ -65,7 +65,7 @@ class Channel : public framing::ChannelAdapter
sys::Thread basicDispatcher;
ResponseHandler responses;
- u_int16_t prefetch;
+ uint16_t prefetch;
const bool transactional;
framing::ProtocolVersion version;
@@ -122,7 +122,7 @@ class Channel : public framing::ChannelAdapter
* messages the channel is willing to have sent to it
* asynchronously
*/
- Channel(bool transactional = false, u_int16_t prefetch = 500);
+ Channel(bool transactional = false, uint16_t prefetch = 500);
~Channel();
/**
@@ -221,9 +221,9 @@ class Channel : public framing::ChannelAdapter
/**
* Change the prefetch in use.
*/
- void setPrefetch(u_int16_t prefetch);
+ void setPrefetch(uint16_t prefetch);
- u_int16_t getPrefetch() { return prefetch; }
+ uint16_t getPrefetch() { return prefetch; }
/**
* Start message dispatching on a new thread
diff --git a/cpp/lib/client/ClientMessage.cpp b/cpp/lib/client/ClientMessage.cpp
index bd4adb78f7..f55c4abfe6 100644
--- a/cpp/lib/client/ClientMessage.cpp
+++ b/cpp/lib/client/ClientMessage.cpp
@@ -55,11 +55,11 @@ FieldTable& Message::getHeaders() const {
return getHeaderProperties()->getHeaders();
}
-u_int8_t Message::getDeliveryMode() const {
+uint8_t Message::getDeliveryMode() const {
return getHeaderProperties()->getDeliveryMode();
}
-u_int8_t Message::getPriority() const {
+uint8_t Message::getPriority() const {
return getHeaderProperties()->getPriority();
}
@@ -79,7 +79,7 @@ const std::string& Message::getMessageId() const {
return getHeaderProperties()->getMessageId();
}
-u_int64_t Message::getTimestamp() const {
+uint64_t Message::getTimestamp() const {
return getHeaderProperties()->getTimestamp();
}
@@ -111,11 +111,11 @@ void Message::setHeaders(const FieldTable& headers){
getHeaderProperties()->setHeaders(headers);
}
-void Message::setDeliveryMode(u_int8_t mode){
+void Message::setDeliveryMode(uint8_t mode){
getHeaderProperties()->setDeliveryMode(mode);
}
-void Message::setPriority(u_int8_t priority){
+void Message::setPriority(uint8_t priority){
getHeaderProperties()->setPriority(priority);
}
@@ -135,7 +135,7 @@ void Message::setMessageId(const std::string& messageId){
getHeaderProperties()->setMessageId(messageId);
}
-void Message::setTimestamp(u_int64_t timestamp){
+void Message::setTimestamp(uint64_t timestamp){
getHeaderProperties()->setTimestamp(timestamp);
}
@@ -156,7 +156,7 @@ void Message::setClusterId(const std::string& clusterId){
}
-u_int64_t Message::getDeliveryTag() const {
+uint64_t Message::getDeliveryTag() const {
BasicDeliverBody* deliver=dynamic_cast<BasicDeliverBody*>(method.get());
return deliver ? deliver->getDeliveryTag() : 0;
}
diff --git a/cpp/lib/client/ClientMessage.h b/cpp/lib/client/ClientMessage.h
index 0b44d51a47..cb239ed4d6 100644
--- a/cpp/lib/client/ClientMessage.h
+++ b/cpp/lib/client/ClientMessage.h
@@ -72,18 +72,18 @@ class Message {
bool isRedelivered(){ return redelivered; }
void setRedelivered(bool _redelivered){ redelivered = _redelivered; }
- u_int64_t getDeliveryTag() const;
+ uint64_t getDeliveryTag() const;
const std::string& getContentType() const;
const std::string& getContentEncoding() const;
qpid::framing::FieldTable& getHeaders() const;
- u_int8_t getDeliveryMode() const;
- u_int8_t getPriority() const;
+ uint8_t getDeliveryMode() const;
+ uint8_t getPriority() const;
const std::string& getCorrelationId() const;
const std::string& getReplyTo() const;
const std::string& getExpiration() const;
const std::string& getMessageId() const;
- u_int64_t getTimestamp() const;
+ uint64_t getTimestamp() const;
const std::string& getType() const;
const std::string& getUserId() const;
const std::string& getAppId() const;
@@ -95,13 +95,13 @@ class Message {
/**
* Sets the delivery mode. 1 = non-durable, 2 = durable.
*/
- void setDeliveryMode(u_int8_t mode);
- void setPriority(u_int8_t priority);
+ void setDeliveryMode(uint8_t mode);
+ void setPriority(uint8_t priority);
void setCorrelationId(const std::string& correlationId);
void setReplyTo(const std::string& replyTo);
void setExpiration(const std::string& expiration);
void setMessageId(const std::string& messageId);
- void setTimestamp(u_int64_t timestamp);
+ void setTimestamp(uint64_t timestamp);
void setType(const std::string& type);
void setUserId(const std::string& userId);
void setAppId(const std::string& appId);
diff --git a/cpp/lib/client/Connection.cpp b/cpp/lib/client/Connection.cpp
index 566c8fc573..618f3cbc92 100644
--- a/cpp/lib/client/Connection.cpp
+++ b/cpp/lib/client/Connection.cpp
@@ -41,7 +41,7 @@ namespace client {
const std::string Connection::OK("OK");
Connection::Connection(
- bool _debug, u_int32_t _max_frame_size,
+ bool _debug, uint32_t _max_frame_size,
framing::ProtocolVersion _version
) : channelIdCounter(0), version(_version), max_frame_size(_max_frame_size),
defaultConnector(version, _debug, _max_frame_size),
diff --git a/cpp/lib/client/Connection.h b/cpp/lib/client/Connection.h
index 4fa95a1439..b4bd311511 100644
--- a/cpp/lib/client/Connection.h
+++ b/cpp/lib/client/Connection.h
@@ -91,7 +91,7 @@ class Connection : public ConnectionForChannel
static const std::string OK;
framing::ProtocolVersion version;
- const u_int32_t max_frame_size;
+ const uint32_t max_frame_size;
ChannelMap channels;
Connector defaultConnector;
Connector* connector;
@@ -121,7 +121,7 @@ class Connection : public ConnectionForChannel
* @param max_frame_size the maximum frame size that the
* client will accept. Optional and defaults to 65536.
*/
- Connection(bool debug = false, u_int32_t max_frame_size = 65536,
+ Connection(bool debug = false, uint32_t max_frame_size = 65536,
framing::ProtocolVersion=framing::highestProtocolVersion);
~Connection();
@@ -182,7 +182,7 @@ class Connection : public ConnectionForChannel
/**
* @return the maximum frame size in use on this connection
*/
- inline u_int32_t getMaxFrameSize(){ return max_frame_size; }
+ inline uint32_t getMaxFrameSize(){ return max_frame_size; }
/** @return protocol version in use on this connection. */
framing::ProtocolVersion getVersion() const { return version; }
diff --git a/cpp/lib/client/Connector.cpp b/cpp/lib/client/Connector.cpp
index ee90e6cd4c..7b73cc016a 100644
--- a/cpp/lib/client/Connector.cpp
+++ b/cpp/lib/client/Connector.cpp
@@ -31,7 +31,7 @@ using namespace qpid::framing;
using qpid::QpidError;
Connector::Connector(
- ProtocolVersion ver, bool _debug, u_int32_t buffer_size
+ ProtocolVersion ver, bool _debug, uint32_t buffer_size
) : debug(_debug),
receive_buffer_size(buffer_size),
send_buffer_size(buffer_size),
@@ -131,7 +131,7 @@ void Connector::checkIdle(ssize_t status){
}
}
-void Connector::setReadTimeout(u_int16_t t){
+void Connector::setReadTimeout(uint16_t t){
idleIn = t * 1000;//t is in secs
if(idleIn && (!timeout || idleIn < timeout)){
timeout = idleIn;
@@ -140,7 +140,7 @@ void Connector::setReadTimeout(u_int16_t t){
}
-void Connector::setWriteTimeout(u_int16_t t){
+void Connector::setWriteTimeout(uint16_t t){
idleOut = t * 1000;//t is in secs
if(idleOut && (!timeout || idleOut < timeout)){
timeout = idleOut;
diff --git a/cpp/lib/client/Connector.h b/cpp/lib/client/Connector.h
index ccac39f849..91234d2321 100644
--- a/cpp/lib/client/Connector.h
+++ b/cpp/lib/client/Connector.h
@@ -50,8 +50,8 @@ class Connector : public framing::OutputHandler,
int64_t lastIn;
int64_t lastOut;
int64_t timeout;
- u_int32_t idleIn;
- u_int32_t idleOut;
+ uint32_t idleIn;
+ uint32_t idleOut;
sys::TimeoutHandler* timeoutHandler;
sys::ShutdownHandler* shutdownHandler;
@@ -78,7 +78,7 @@ class Connector : public framing::OutputHandler,
friend class Channel;
public:
Connector(framing::ProtocolVersion pVersion,
- bool debug = false, u_int32_t buffer_size = 1024);
+ bool debug = false, uint32_t buffer_size = 1024);
virtual ~Connector();
virtual void connect(const std::string& host, int port);
virtual void init();
@@ -88,8 +88,8 @@ class Connector : public framing::OutputHandler,
virtual void setShutdownHandler(sys::ShutdownHandler* handler);
virtual framing::OutputHandler* getOutputHandler();
virtual void send(framing::AMQFrame* frame);
- virtual void setReadTimeout(u_int16_t timeout);
- virtual void setWriteTimeout(u_int16_t timeout);
+ virtual void setReadTimeout(uint16_t timeout);
+ virtual void setWriteTimeout(uint16_t timeout);
};
}}
diff --git a/cpp/lib/client/MethodBodyInstances.h b/cpp/lib/client/MethodBodyInstances.h
index 3ab0c9af8f..acbeeb1158 100644
--- a/cpp/lib/client/MethodBodyInstances.h
+++ b/cpp/lib/client/MethodBodyInstances.h
@@ -61,7 +61,7 @@ public:
const qpid::framing::TxRollbackOkBody tx_rollback_ok;
const qpid::framing::TxSelectOkBody tx_select_ok;
- MethodBodyInstances(u_int8_t major, u_int8_t minor) :
+ MethodBodyInstances(uint8_t major, uint8_t minor) :
version(major, minor),
basic_cancel_ok(version),
basic_consume_ok(version),
View Lorry Controller Status