You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/03/15 20:22:06 UTC
svn commit: r518733 [2/2] - in /incubator/qpid/branches/qpid.0-9/cpp:
lib/broker/ lib/client/ lib/common/framing/ lib/common/sys/apr/ tests/
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientChannel.h Thu Mar 15 12:22:02 2007
@@ -65,7 +65,7 @@
sys::Thread basicDispatcher;
ResponseHandler responses;
- u_int16_t prefetch;
+ uint16_t prefetch;
const bool transactional;
framing::ProtocolVersion version;
@@ -122,7 +122,7 @@
* 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 @@
/**
* 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
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientMessage.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientMessage.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientMessage.cpp Thu Mar 15 12:22:02 2007
@@ -55,11 +55,11 @@
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 @@
return getHeaderProperties()->getMessageId();
}
-u_int64_t Message::getTimestamp() const {
+uint64_t Message::getTimestamp() const {
return getHeaderProperties()->getTimestamp();
}
@@ -111,11 +111,11 @@
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 @@
getHeaderProperties()->setMessageId(messageId);
}
-void Message::setTimestamp(u_int64_t timestamp){
+void Message::setTimestamp(uint64_t timestamp){
getHeaderProperties()->setTimestamp(timestamp);
}
@@ -156,7 +156,7 @@
}
-u_int64_t Message::getDeliveryTag() const {
+uint64_t Message::getDeliveryTag() const {
BasicDeliverBody* deliver=dynamic_cast<BasicDeliverBody*>(method.get());
return deliver ? deliver->getDeliveryTag() : 0;
}
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientMessage.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientMessage.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/client/ClientMessage.h Thu Mar 15 12:22:02 2007
@@ -72,18 +72,18 @@
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 @@
/**
* 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);
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connection.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connection.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connection.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connection.cpp Thu Mar 15 12:22:02 2007
@@ -41,7 +41,7 @@
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),
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connection.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connection.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connection.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connection.h Thu Mar 15 12:22:02 2007
@@ -91,7 +91,7 @@
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 @@
* @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 @@
/**
* @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; }
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connector.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connector.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connector.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connector.cpp Thu Mar 15 12:22:02 2007
@@ -31,7 +31,7 @@
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::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::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;
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connector.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connector.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connector.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connector.h Thu Mar 15 12:22:02 2007
@@ -50,8 +50,8 @@
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 @@
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 @@
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);
};
}}
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/client/MethodBodyInstances.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/client/MethodBodyInstances.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/client/MethodBodyInstances.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/client/MethodBodyInstances.h Thu Mar 15 12:22:02 2007
@@ -61,7 +61,7 @@
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),
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQBody.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQBody.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQBody.h Thu Mar 15 12:22:02 2007
@@ -34,10 +34,10 @@
typedef boost::shared_ptr<AMQBody> shared_ptr;
virtual ~AMQBody();
- virtual u_int32_t size() const = 0;
- virtual u_int8_t type() const = 0;
+ virtual uint32_t size() const = 0;
+ virtual uint8_t type() const = 0;
virtual void encode(Buffer& buffer) const = 0;
- virtual void decode(Buffer& buffer, u_int32_t size) = 0;
+ virtual void decode(Buffer& buffer, uint32_t size) = 0;
virtual void print(std::ostream& out) const = 0;
};
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQContentBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQContentBody.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQContentBody.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQContentBody.cpp Thu Mar 15 12:22:02 2007
@@ -27,13 +27,13 @@
qpid::framing::AMQContentBody::AMQContentBody(const string& _data) : data(_data){
}
-u_int32_t qpid::framing::AMQContentBody::size() const{
+uint32_t qpid::framing::AMQContentBody::size() const{
return data.size();
}
void qpid::framing::AMQContentBody::encode(Buffer& buffer) const{
buffer.putRawData(data);
}
-void qpid::framing::AMQContentBody::decode(Buffer& buffer, u_int32_t _size){
+void qpid::framing::AMQContentBody::decode(Buffer& buffer, uint32_t _size){
buffer.getRawData(data, _size);
}
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQContentBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQContentBody.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQContentBody.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQContentBody.h Thu Mar 15 12:22:02 2007
@@ -38,11 +38,11 @@
AMQContentBody();
AMQContentBody(const string& data);
inline virtual ~AMQContentBody(){}
- inline u_int8_t type() const { return CONTENT_BODY; };
+ inline uint8_t type() const { return CONTENT_BODY; };
inline string& getData(){ return data; }
- u_int32_t size() const;
+ uint32_t size() const;
void encode(Buffer& buffer) const;
- void decode(Buffer& buffer, u_int32_t size);
+ void decode(Buffer& buffer, uint32_t size);
void print(std::ostream& out) const;
};
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQDataBlock.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQDataBlock.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQDataBlock.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQDataBlock.h Thu Mar 15 12:22:02 2007
@@ -32,7 +32,7 @@
virtual ~AMQDataBlock() {}
virtual void encode(Buffer& buffer) = 0;
virtual bool decode(Buffer& buffer) = 0;
- virtual u_int32_t size() const = 0;
+ virtual uint32_t size() const = 0;
};
}
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQFrame.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQFrame.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQFrame.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQFrame.cpp Thu Mar 15 12:22:02 2007
@@ -39,17 +39,17 @@
assert(version != ProtocolVersion(0,0));
}
-AMQFrame::AMQFrame(ProtocolVersion _version, u_int16_t _channel, AMQBody* _body) :
+AMQFrame::AMQFrame(ProtocolVersion _version, uint16_t _channel, AMQBody* _body) :
version(_version), channel(_channel), body(_body)
{}
-AMQFrame::AMQFrame(ProtocolVersion _version, u_int16_t _channel, const AMQBody::shared_ptr& _body) :
+AMQFrame::AMQFrame(ProtocolVersion _version, uint16_t _channel, const AMQBody::shared_ptr& _body) :
version(_version), channel(_channel), body(_body)
{}
AMQFrame::~AMQFrame() {}
-u_int16_t AMQFrame::getChannel(){
+uint16_t AMQFrame::getChannel(){
return channel;
}
@@ -66,7 +66,7 @@
buffer.putOctet(0xCE);
}
-u_int32_t AMQFrame::size() const{
+uint32_t AMQFrame::size() const{
assert(body.get());
return 1/*type*/ + 2/*channel*/ + 4/*body size*/ + body->size()
+ 1/*0xCE*/;
@@ -77,18 +77,18 @@
if(buffer.available() < 7)
return false;
buffer.record();
- u_int32_t frameSize = decodeHead(buffer);
+ uint32_t frameSize = decodeHead(buffer);
if(buffer.available() < frameSize + 1){
buffer.restore();
return false;
}
decodeBody(buffer, frameSize);
- u_int8_t end = buffer.getOctet();
+ uint8_t end = buffer.getOctet();
if(end != 0xCE) THROW_QPID_ERROR(FRAMING_ERROR, "Frame end not found");
return true;
}
-u_int32_t AMQFrame::decodeHead(Buffer& buffer){
+uint32_t AMQFrame::decodeHead(Buffer& buffer){
type = buffer.getOctet();
channel = buffer.getShort();
return buffer.getLong();
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQFrame.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQFrame.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQFrame.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQFrame.h Thu Mar 15 12:22:02 2007
@@ -42,13 +42,13 @@
{
public:
AMQFrame(ProtocolVersion _version = highestProtocolVersion);
- AMQFrame(ProtocolVersion _version, u_int16_t channel, AMQBody* body);
- AMQFrame(ProtocolVersion _version, u_int16_t channel, const AMQBody::shared_ptr& body);
+ AMQFrame(ProtocolVersion _version, uint16_t channel, AMQBody* body);
+ AMQFrame(ProtocolVersion _version, uint16_t channel, const AMQBody::shared_ptr& body);
virtual ~AMQFrame();
virtual void encode(Buffer& buffer);
virtual bool decode(Buffer& buffer);
- virtual u_int32_t size() const;
- u_int16_t getChannel();
+ virtual uint32_t size() const;
+ uint16_t getChannel();
AMQBody::shared_ptr getBody();
/** Convenience template to cast the body to an expected type */
@@ -57,15 +57,15 @@
boost::static_pointer_cast<T>(getBody());
}
- u_int32_t decodeHead(Buffer& buffer);
+ uint32_t decodeHead(Buffer& buffer);
void decodeBody(Buffer& buffer, uint32_t size);
private:
static AMQP_MethodVersionMap versionMap;
ProtocolVersion version;
- u_int16_t channel;
- u_int8_t type;
+ uint16_t channel;
+ uint8_t type;
AMQBody::shared_ptr body;
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQHeaderBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQHeaderBody.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQHeaderBody.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQHeaderBody.cpp Thu Mar 15 12:22:02 2007
@@ -33,7 +33,7 @@
delete properties;
}
-u_int32_t qpid::framing::AMQHeaderBody::size() const{
+uint32_t qpid::framing::AMQHeaderBody::size() const{
return 12 + properties->size();
}
@@ -44,8 +44,8 @@
properties->encode(buffer);
}
-void qpid::framing::AMQHeaderBody::decode(Buffer& buffer, u_int32_t bufSize){
- u_int16_t classId = buffer.getShort();
+void qpid::framing::AMQHeaderBody::decode(Buffer& buffer, uint32_t bufSize){
+ uint16_t classId = buffer.getShort();
weight = buffer.getShort();
contentSize = buffer.getLongLong();
createProperties(classId);
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQHeaderBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQHeaderBody.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQHeaderBody.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQHeaderBody.h Thu Mar 15 12:22:02 2007
@@ -32,8 +32,8 @@
class AMQHeaderBody : public AMQBody
{
HeaderProperties* properties;
- u_int16_t weight;
- u_int64_t contentSize;
+ uint16_t weight;
+ uint64_t contentSize;
void createProperties(int classId);
public:
@@ -41,15 +41,15 @@
AMQHeaderBody(int classId);
AMQHeaderBody();
- inline u_int8_t type() const { return HEADER_BODY; }
+ inline uint8_t type() const { return HEADER_BODY; }
HeaderProperties* getProperties(){ return properties; }
const HeaderProperties* getProperties() const { return properties; }
- inline u_int64_t getContentSize() const { return contentSize; }
- inline void setContentSize(u_int64_t _size) { contentSize = _size; }
+ inline uint64_t getContentSize() const { return contentSize; }
+ inline void setContentSize(uint64_t _size) { contentSize = _size; }
virtual ~AMQHeaderBody();
- virtual u_int32_t size() const;
+ virtual uint32_t size() const;
virtual void encode(Buffer& buffer) const;
- virtual void decode(Buffer& buffer, u_int32_t size);
+ virtual void decode(Buffer& buffer, uint32_t size);
virtual void print(std::ostream& out) const;
};
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQHeartbeatBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQHeartbeatBody.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQHeartbeatBody.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQHeartbeatBody.h Thu Mar 15 12:22:02 2007
@@ -34,10 +34,10 @@
typedef boost::shared_ptr<AMQHeartbeatBody> shared_ptr;
virtual ~AMQHeartbeatBody();
- inline u_int32_t size() const { return 0; }
- inline u_int8_t type() const { return HEARTBEAT_BODY; }
+ inline uint32_t size() const { return 0; }
+ inline uint8_t type() const { return HEARTBEAT_BODY; }
inline void encode(Buffer& ) const {}
- inline void decode(Buffer& , u_int32_t /*size*/) {}
+ inline void decode(Buffer& , uint32_t /*size*/) {}
virtual void print(std::ostream& out) const;
};
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQMethodBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQMethodBody.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQMethodBody.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQMethodBody.cpp Thu Mar 15 12:22:02 2007
@@ -52,7 +52,7 @@
methodId = buffer.getShort();
}
-void AMQMethodBody::decode(Buffer& buffer, u_int32_t /*size*/) {
+void AMQMethodBody::decode(Buffer& buffer, uint32_t /*size*/) {
decodeContent(buffer);
}
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQMethodBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQMethodBody.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQMethodBody.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQMethodBody.h Thu Mar 15 12:22:02 2007
@@ -42,11 +42,11 @@
AMQP_MethodVersionMap& map, ProtocolVersion version, Buffer& buf);
ProtocolVersion version;
- u_int8_t type() const { return METHOD_BODY; }
- AMQMethodBody(u_int8_t major, u_int8_t minor) : version(major, minor) {}
+ uint8_t type() const { return METHOD_BODY; }
+ AMQMethodBody(uint8_t major, uint8_t minor) : version(major, minor) {}
AMQMethodBody(ProtocolVersion ver) : version(ver) {}
virtual ~AMQMethodBody() {}
- void decode(Buffer&, u_int32_t);
+ void decode(Buffer&, uint32_t);
virtual MethodId amqpMethodId() const = 0;
virtual ClassId amqpClassId() const = 0;
@@ -64,11 +64,11 @@
virtual bool isResponse() const { return false; }
protected:
- static u_int32_t baseSize() { return 4; }
+ static uint32_t baseSize() { return 4; }
struct ClassMethodId {
- u_int16_t classId;
- u_int16_t methodId;
+ uint16_t classId;
+ uint16_t methodId;
void decode(Buffer& b);
};
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQRequestBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQRequestBody.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQRequestBody.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQRequestBody.h Thu Mar 15 12:22:02 2007
@@ -53,7 +53,7 @@
AMQRequestBody(ProtocolVersion v, RequestId id=0, ResponseId mark=0)
: AMQMethodBody(v), data(id, mark) {}
- u_int8_t type() const { return REQUEST_BODY; }
+ uint8_t type() const { return REQUEST_BODY; }
void encode(Buffer& buffer) const;
Data& getData() { return data; }
@@ -64,7 +64,7 @@
bool isRequest()const { return true; }
protected:
- static const u_int32_t baseSize() { return AMQMethodBody::baseSize()+20; }
+ static const uint32_t baseSize() { return AMQMethodBody::baseSize()+20; }
void printPrefix(std::ostream& out) const;
private:
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQResponseBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQResponseBody.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQResponseBody.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQResponseBody.h Thu Mar 15 12:22:02 2007
@@ -41,9 +41,9 @@
void encode(Buffer&) const;
void decode(Buffer&);
- u_int64_t responseId;
- u_int64_t requestId;
- u_int32_t batchOffset;
+ uint64_t responseId;
+ uint64_t requestId;
+ uint32_t batchOffset;
};
static Data& getData(const AMQBody::shared_ptr& body) {
@@ -58,7 +58,7 @@
ProtocolVersion v, ResponseId id=0, RequestId req=0, BatchOffset off=0)
: AMQMethodBody(v), data(id, req, off) {}
- u_int8_t type() const { return RESPONSE_BODY; }
+ uint8_t type() const { return RESPONSE_BODY; }
void encode(Buffer& buffer) const;
Data& getData() { return data; }
@@ -71,7 +71,7 @@
bool isResponse() const { return true; }
protected:
- static const u_int32_t baseSize() { return AMQMethodBody::baseSize()+20; }
+ static const uint32_t baseSize() { return AMQMethodBody::baseSize()+20; }
void printPrefix(std::ostream& out) const;
private:
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/BasicHeaderProperties.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/BasicHeaderProperties.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/BasicHeaderProperties.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/BasicHeaderProperties.cpp Thu Mar 15 12:22:02 2007
@@ -25,8 +25,8 @@
qpid::framing::BasicHeaderProperties::BasicHeaderProperties() : deliveryMode(0), priority(0), timestamp(0){}
qpid::framing::BasicHeaderProperties::~BasicHeaderProperties(){}
-u_int32_t qpid::framing::BasicHeaderProperties::size() const{
- u_int32_t bytes = 2;//flags
+uint32_t qpid::framing::BasicHeaderProperties::size() const{
+ uint32_t bytes = 2;//flags
if(contentType.length() > 0) bytes += contentType.length() + 1;
if(contentEncoding.length() > 0) bytes += contentEncoding.length() + 1;
if(headers.count() > 0) bytes += headers.size();
@@ -46,7 +46,7 @@
}
void qpid::framing::BasicHeaderProperties::encode(qpid::framing::Buffer& buffer) const{
- u_int16_t flags = getFlags();
+ uint16_t flags = getFlags();
buffer.putShort(flags);
if(contentType.length() > 0) buffer.putShortString(contentType);
@@ -65,8 +65,8 @@
if(clusterId.length() > 0) buffer.putShortString(clusterId);
}
-void qpid::framing::BasicHeaderProperties::decode(qpid::framing::Buffer& buffer, u_int32_t /*size*/){
- u_int16_t flags = buffer.getShort();
+void qpid::framing::BasicHeaderProperties::decode(qpid::framing::Buffer& buffer, uint32_t /*size*/){
+ uint16_t flags = buffer.getShort();
if(flags & (1 << 15)) buffer.getShortString(contentType);
if(flags & (1 << 14)) buffer.getShortString(contentEncoding);
if(flags & (1 << 13)) buffer.getFieldTable(headers);
@@ -83,8 +83,8 @@
if(flags & (1 << 2)) buffer.getShortString(clusterId);
}
-u_int16_t qpid::framing::BasicHeaderProperties::getFlags() const{
- u_int16_t flags(0);
+uint16_t qpid::framing::BasicHeaderProperties::getFlags() const{
+ uint16_t flags(0);
if(contentType.length() > 0) flags |= (1 << 15);
if(contentEncoding.length() > 0) flags |= (1 << 14);
if(headers.count() > 0) flags |= (1 << 13);
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/BasicHeaderProperties.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/BasicHeaderProperties.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/BasicHeaderProperties.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/BasicHeaderProperties.h Thu Mar 15 12:22:02 2007
@@ -36,39 +36,39 @@
string contentType;
string contentEncoding;
FieldTable headers;
- u_int8_t deliveryMode;
- u_int8_t priority;
+ uint8_t deliveryMode;
+ uint8_t priority;
string correlationId;
string replyTo;
string expiration;
string messageId;
- u_int64_t timestamp;
+ uint64_t timestamp;
string type;
string userId;
string appId;
string clusterId;
- u_int16_t getFlags() const;
+ uint16_t getFlags() const;
public:
BasicHeaderProperties();
virtual ~BasicHeaderProperties();
- virtual u_int32_t size() const;
+ virtual uint32_t size() const;
virtual void encode(Buffer& buffer) const;
- virtual void decode(Buffer& buffer, u_int32_t size);
+ virtual void decode(Buffer& buffer, uint32_t size);
- inline virtual u_int8_t classId() { return BASIC; }
+ inline virtual uint8_t classId() { return BASIC; }
inline const string& getContentType() const { return contentType; }
inline const string& getContentEncoding() const { return contentEncoding; }
inline FieldTable& getHeaders() { return headers; }
- inline u_int8_t getDeliveryMode() const { return deliveryMode; }
- inline u_int8_t getPriority() const { return priority; }
+ inline uint8_t getDeliveryMode() const { return deliveryMode; }
+ inline uint8_t getPriority() const { return priority; }
inline const string& getCorrelationId() const {return correlationId; }
inline const string& getReplyTo() const { return replyTo; }
inline const string& getExpiration() const { return expiration; }
inline const string& getMessageId() const {return messageId; }
- inline u_int64_t getTimestamp() const { return timestamp; }
+ inline uint64_t getTimestamp() const { return timestamp; }
inline const string& getType() const { return type; }
inline const string& getUserId() const { return userId; }
inline const string& getAppId() const { return appId; }
@@ -77,13 +77,13 @@
void inline setContentType(const string& _type){ contentType = _type; }
void inline setContentEncoding(const string& encoding){ contentEncoding = encoding; }
void inline setHeaders(const FieldTable& _headers){ headers = _headers; }
- void inline setDeliveryMode(u_int8_t mode){ deliveryMode = mode; }
- void inline setPriority(u_int8_t _priority){ priority = _priority; }
+ void inline setDeliveryMode(uint8_t mode){ deliveryMode = mode; }
+ void inline setPriority(uint8_t _priority){ priority = _priority; }
void inline setCorrelationId(const string& _correlationId){ correlationId = _correlationId; }
void inline setReplyTo(const string& _replyTo){ replyTo = _replyTo;}
void inline setExpiration(const string& _expiration){ expiration = _expiration; }
void inline setMessageId(const string& _messageId){ messageId = _messageId; }
- void inline setTimestamp(u_int64_t _timestamp){ timestamp = _timestamp; }
+ void inline setTimestamp(uint64_t _timestamp){ timestamp = _timestamp; }
void inline setType(const string& _type){ type = _type; }
void inline setUserId(const string& _userId){ userId = _userId; }
void inline setAppId(const string& _appId){appId = _appId; }
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Buffer.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Buffer.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Buffer.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Buffer.cpp Thu Mar 15 12:22:02 2007
@@ -22,11 +22,11 @@
#include <FramingContent.h>
#include <FieldTable.h>
-qpid::framing::Buffer::Buffer(u_int32_t _size) : size(_size), owner(true), position(0), limit(_size){
+qpid::framing::Buffer::Buffer(uint32_t _size) : size(_size), owner(true), position(0), limit(_size){
data = new char[size];
}
-qpid::framing::Buffer::Buffer(char* _data, u_int32_t _size) : size(_size), owner(false), data(_data), position(0), limit(_size){
+qpid::framing::Buffer::Buffer(char* _data, uint32_t _size) : size(_size), owner(false), data(_data), position(0), limit(_size){
}
qpid::framing::Buffer::~Buffer(){
@@ -44,7 +44,7 @@
}
void qpid::framing::Buffer::compact(){
- u_int32_t p = limit - position;
+ uint32_t p = limit - position;
//copy p chars from position to 0
memmove(data, data + position, p);
limit = size;
@@ -61,7 +61,7 @@
limit = r_limit;
}
-u_int32_t qpid::framing::Buffer::available(){
+uint32_t qpid::framing::Buffer::available(){
return limit - position;
}
@@ -69,51 +69,51 @@
return data + position;
}
-void qpid::framing::Buffer::move(u_int32_t bytes){
+void qpid::framing::Buffer::move(uint32_t bytes){
position += bytes;
}
-void qpid::framing::Buffer::putOctet(u_int8_t i){
+void qpid::framing::Buffer::putOctet(uint8_t i){
data[position++] = i;
}
-void qpid::framing::Buffer::putShort(u_int16_t i){
- u_int16_t b = i;
- data[position++] = (u_int8_t) (0xFF & (b >> 8));
- data[position++] = (u_int8_t) (0xFF & b);
-}
-
-void qpid::framing::Buffer::putLong(u_int32_t i){
- u_int32_t b = i;
- data[position++] = (u_int8_t) (0xFF & (b >> 24));
- data[position++] = (u_int8_t) (0xFF & (b >> 16));
- data[position++] = (u_int8_t) (0xFF & (b >> 8));
- data[position++] = (u_int8_t) (0xFF & b);
-}
-
-void qpid::framing::Buffer::putLongLong(u_int64_t i){
- u_int32_t hi = i >> 32;
- u_int32_t lo = i;
+void qpid::framing::Buffer::putShort(uint16_t i){
+ uint16_t b = i;
+ data[position++] = (uint8_t) (0xFF & (b >> 8));
+ data[position++] = (uint8_t) (0xFF & b);
+}
+
+void qpid::framing::Buffer::putLong(uint32_t i){
+ uint32_t b = i;
+ data[position++] = (uint8_t) (0xFF & (b >> 24));
+ data[position++] = (uint8_t) (0xFF & (b >> 16));
+ data[position++] = (uint8_t) (0xFF & (b >> 8));
+ data[position++] = (uint8_t) (0xFF & b);
+}
+
+void qpid::framing::Buffer::putLongLong(uint64_t i){
+ uint32_t hi = i >> 32;
+ uint32_t lo = i;
putLong(hi);
putLong(lo);
}
-u_int8_t qpid::framing::Buffer::getOctet(){
- return (u_int8_t) data[position++];
+uint8_t qpid::framing::Buffer::getOctet(){
+ return (uint8_t) data[position++];
}
-u_int16_t qpid::framing::Buffer::getShort(){
- u_int16_t hi = (unsigned char) data[position++];
+uint16_t qpid::framing::Buffer::getShort(){
+ uint16_t hi = (unsigned char) data[position++];
hi = hi << 8;
hi |= (unsigned char) data[position++];
return hi;
}
-u_int32_t qpid::framing::Buffer::getLong(){
- u_int32_t a = (unsigned char) data[position++];
- u_int32_t b = (unsigned char) data[position++];
- u_int32_t c = (unsigned char) data[position++];
- u_int32_t d = (unsigned char) data[position++];
+uint32_t qpid::framing::Buffer::getLong(){
+ uint32_t a = (unsigned char) data[position++];
+ uint32_t b = (unsigned char) data[position++];
+ uint32_t c = (unsigned char) data[position++];
+ uint32_t d = (unsigned char) data[position++];
a = a << 24;
a |= b << 16;
a |= c << 8;
@@ -121,36 +121,36 @@
return a;
}
-u_int64_t qpid::framing::Buffer::getLongLong(){
- u_int64_t hi = getLong();
- u_int64_t lo = getLong();
+uint64_t qpid::framing::Buffer::getLongLong(){
+ uint64_t hi = getLong();
+ uint64_t lo = getLong();
hi = hi << 32;
return hi | lo;
}
void qpid::framing::Buffer::putShortString(const string& s){
- u_int8_t len = s.length();
+ uint8_t len = s.length();
putOctet(len);
s.copy(data + position, len);
position += len;
}
void qpid::framing::Buffer::putLongString(const string& s){
- u_int32_t len = s.length();
+ uint32_t len = s.length();
putLong(len);
s.copy(data + position, len);
position += len;
}
void qpid::framing::Buffer::getShortString(string& s){
- u_int8_t len = getOctet();
+ uint8_t len = getOctet();
s.assign(data + position, len);
position += len;
}
void qpid::framing::Buffer::getLongString(string& s){
- u_int32_t len = getLong();
+ uint32_t len = getLong();
s.assign(data + position, len);
position += len;
}
@@ -172,12 +172,12 @@
}
void qpid::framing::Buffer::putRawData(const string& s){
- u_int32_t len = s.length();
+ uint32_t len = s.length();
s.copy(data + position, len);
position += len;
}
-void qpid::framing::Buffer::getRawData(string& s, u_int32_t len){
+void qpid::framing::Buffer::getRawData(string& s, uint32_t len){
s.assign(data + position, len);
position += len;
}
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Buffer.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Buffer.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Buffer.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Buffer.h Thu Mar 15 12:22:02 2007
@@ -31,18 +31,18 @@
class Buffer
{
- const u_int32_t size;
+ const uint32_t size;
const bool owner;//indicates whether the data is owned by this instance
char* data;
- u_int32_t position;
- u_int32_t limit;
- u_int32_t r_position;
- u_int32_t r_limit;
+ uint32_t position;
+ uint32_t limit;
+ uint32_t r_position;
+ uint32_t r_limit;
public:
- Buffer(u_int32_t size);
- Buffer(char* data, u_int32_t size);
+ Buffer(uint32_t size);
+ Buffer(char* data, uint32_t size);
~Buffer();
void flip();
@@ -50,19 +50,19 @@
void compact();
void record();
void restore();
- u_int32_t available();
+ uint32_t available();
char* start();
- void move(u_int32_t bytes);
+ void move(uint32_t bytes);
- void putOctet(u_int8_t i);
- void putShort(u_int16_t i);
- void putLong(u_int32_t i);
- void putLongLong(u_int64_t i);
-
- u_int8_t getOctet();
- u_int16_t getShort();
- u_int32_t getLong();
- u_int64_t getLongLong();
+ void putOctet(uint8_t i);
+ void putShort(uint16_t i);
+ void putLong(uint32_t i);
+ void putLongLong(uint64_t i);
+
+ uint8_t getOctet();
+ uint16_t getShort();
+ uint32_t getLong();
+ uint64_t getLongLong();
void putShortString(const string& s);
void putLongString(const string& s);
@@ -76,7 +76,7 @@
void getContent(Content& c);
void putRawData(const string& s);
- void getRawData(string& s, u_int32_t size);
+ void getRawData(string& s, uint32_t size);
};
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FieldTable.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FieldTable.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FieldTable.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FieldTable.cpp Thu Mar 15 12:22:02 2007
@@ -29,8 +29,8 @@
FieldTable::~FieldTable() {}
-u_int32_t FieldTable::size() const {
- u_int32_t len(4);
+uint32_t FieldTable::size() const {
+ uint32_t len(4);
for(ValueMap::const_iterator i = values.begin(); i != values.end(); ++i) {
// 2 = shortstr_len_byyte + type_char_byte
len += 2 + (i->first).size() + (i->second)->size();
@@ -68,7 +68,7 @@
values[name] = ValuePtr(new IntegerValue(value));
}
-void FieldTable::setTimestamp(const std::string& name, u_int64_t value){
+void FieldTable::setTimestamp(const std::string& name, uint64_t value){
values[name] = ValuePtr(new TimeValue(value));
}
@@ -79,7 +79,7 @@
namespace {
template <class T> T default_value() { return T(); }
template <> int default_value<int>() { return 0; }
-template <> u_int64_t default_value<u_int64_t>() { return 0; }
+template <> uint64_t default_value<uint64_t>() { return 0; }
}
template <class T>
@@ -99,8 +99,8 @@
return getValue<int>(name);
}
-u_int64_t FieldTable::getTimestamp(const std::string& name) const {
- return getValue<u_int64_t>(name);
+uint64_t FieldTable::getTimestamp(const std::string& name) const {
+ return getValue<uint64_t>(name);
}
void FieldTable::getTable(const std::string& name, FieldTable& value) const {
@@ -117,11 +117,11 @@
}
void FieldTable::decode(Buffer& buffer){
- u_int32_t len = buffer.getLong();
- u_int32_t available = buffer.available();
+ uint32_t len = buffer.getLong();
+ uint32_t available = buffer.available();
if (available < len)
THROW_QPID_ERROR(FRAMING_ERROR, "Not enough data for field table.");
- u_int32_t leftover = available - len;
+ uint32_t leftover = available - len;
while(buffer.available() > leftover){
std::string name;
buffer.getShortString(name);
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FieldTable.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FieldTable.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FieldTable.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FieldTable.h Thu Mar 15 12:22:02 2007
@@ -50,16 +50,16 @@
typedef std::map<std::string, ValuePtr> ValueMap;
~FieldTable();
- u_int32_t size() const;
+ uint32_t size() const;
int count() const;
void setString(const std::string& name, const std::string& value);
void setInt(const std::string& name, int value);
- void setTimestamp(const std::string& name, u_int64_t value);
+ void setTimestamp(const std::string& name, uint64_t value);
void setTable(const std::string& name, const FieldTable& value);
//void setDecimal(string& name, xxx& value);
std::string getString(const std::string& name) const;
int getInt(const std::string& name) const;
- u_int64_t getTimestamp(const std::string& name) const;
+ uint64_t getTimestamp(const std::string& name) const;
void getTable(const std::string& name, FieldTable& value) const;
//void getDecimal(string& name, xxx& value);
void erase(const std::string& name);
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.cpp Thu Mar 15 12:22:02 2007
@@ -30,7 +30,7 @@
Content::Content() : discriminator(0) {}
-Content::Content(u_int8_t _discriminator, const string& _value): discriminator(_discriminator), value(_value) {
+Content::Content(uint8_t _discriminator, const string& _value): discriminator(_discriminator), value(_value) {
validate();
}
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h Thu Mar 15 12:22:02 2007
@@ -14,14 +14,14 @@
*/
class Content
{
- u_int8_t discriminator;
+ uint8_t discriminator;
string value;
void validate();
public:
Content();
- Content(u_int8_t _discriminator, const string& _value);
+ Content(uint8_t _discriminator, const string& _value);
~Content();
void encode(Buffer& buffer) const;
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/HeaderProperties.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/HeaderProperties.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/HeaderProperties.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/HeaderProperties.h Thu Mar 15 12:22:02 2007
@@ -34,10 +34,10 @@
public:
inline virtual ~HeaderProperties(){}
- virtual u_int8_t classId() = 0;
- virtual u_int32_t size() const = 0;
+ virtual uint8_t classId() = 0;
+ virtual uint32_t size() const = 0;
virtual void encode(Buffer& buffer) const = 0;
- virtual void decode(Buffer& buffer, u_int32_t size) = 0;
+ virtual void decode(Buffer& buffer, uint32_t size) = 0;
};
}
}
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/ProtocolInitiation.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/ProtocolInitiation.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/ProtocolInitiation.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/ProtocolInitiation.cpp Thu Mar 15 12:22:02 2007
@@ -25,7 +25,7 @@
ProtocolInitiation::ProtocolInitiation(){}
-ProtocolInitiation::ProtocolInitiation(u_int8_t _major, u_int8_t _minor) : version(_major, _minor) {}
+ProtocolInitiation::ProtocolInitiation(uint8_t _major, uint8_t _minor) : version(_major, _minor) {}
ProtocolInitiation::ProtocolInitiation(ProtocolVersion p) : version(p) {}
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/ProtocolInitiation.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/ProtocolInitiation.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/ProtocolInitiation.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/ProtocolInitiation.h Thu Mar 15 12:22:02 2007
@@ -36,14 +36,14 @@
public:
ProtocolInitiation();
- ProtocolInitiation(u_int8_t major, u_int8_t minor);
+ ProtocolInitiation(uint8_t major, uint8_t minor);
ProtocolInitiation(ProtocolVersion p);
virtual ~ProtocolInitiation();
virtual void encode(Buffer& buffer);
virtual bool decode(Buffer& buffer);
- inline virtual u_int32_t size() const { return 8; }
- inline u_int8_t getMajor() const { return version.getMajor(); }
- inline u_int8_t getMinor() const { return version.getMinor(); }
+ inline virtual uint32_t size() const { return 8; }
+ inline uint8_t getMajor() const { return version.getMajor(); }
+ inline uint8_t getMinor() const { return version.getMinor(); }
inline ProtocolVersion getVersion() const { return version; }
};
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/ProtocolVersion.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/ProtocolVersion.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/ProtocolVersion.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/ProtocolVersion.h Thu Mar 15 12:22:02 2007
@@ -31,17 +31,17 @@
class ProtocolVersion
{
private:
- u_int8_t major_;
- u_int8_t minor_;
+ uint8_t major_;
+ uint8_t minor_;
public:
- ProtocolVersion(u_int8_t _major=0, u_int8_t _minor=0)
+ ProtocolVersion(uint8_t _major=0, uint8_t _minor=0)
: major_(_major), minor_(_minor) {}
- u_int8_t getMajor() const { return major_; }
- void setMajor(u_int8_t major) { major_ = major; }
- u_int8_t getMinor() const { return minor_; }
- void setMinor(u_int8_t minor) { minor_ = minor; }
+ uint8_t getMajor() const { return major_; }
+ void setMajor(uint8_t major) { major_ = major; }
+ uint8_t getMinor() const { return minor_; }
+ void setMinor(uint8_t minor) { minor_ = minor; }
const std::string toString() const;
ProtocolVersion& operator=(ProtocolVersion p);
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp Thu Mar 15 12:22:02 2007
@@ -37,7 +37,7 @@
}
void IntegerValue::encode(Buffer& buffer){
- buffer.putLong((u_int32_t) value);
+ buffer.putLong((uint32_t) value);
}
void IntegerValue::decode(Buffer& buffer){
value = buffer.getLong();
@@ -68,7 +68,7 @@
std::auto_ptr<Value> Value::decode_value(Buffer& buffer)
{
std::auto_ptr<Value> value;
- u_int8_t type = buffer.getOctet();
+ uint8_t type = buffer.getOctet();
switch(type){
case 'S':
value.reset(new StringValue());
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.h Thu Mar 15 12:22:02 2007
@@ -36,10 +36,10 @@
* No arithmetic functionality for now, we only care about encoding/decoding.
*/
struct Decimal {
- u_int32_t value;
- u_int8_t decimals;
+ uint32_t value;
+ uint8_t decimals;
- Decimal(u_int32_t value_=0, u_int8_t decimals_=0) : value(value_), decimals(decimals_) {}
+ Decimal(uint32_t value_=0, uint8_t decimals_=0) : value(value_), decimals(decimals_) {}
bool operator==(const Decimal& d) const {
return decimals == d.decimals && value == d.value;
}
@@ -54,7 +54,7 @@
class Value {
public:
virtual ~Value();
- virtual u_int32_t size() const = 0;
+ virtual uint32_t size() const = 0;
virtual char getType() const = 0;
virtual void encode(Buffer& buffer) = 0;
virtual void decode(Buffer& buffer) = 0;
@@ -97,7 +97,7 @@
public:
StringValue(const std::string& v) : ValueOps<std::string>(v) {}
StringValue() {}
- virtual u_int32_t size() const { return 4 + value.length(); }
+ virtual uint32_t size() const { return 4 + value.length(); }
virtual char getType() const { return 'S'; }
virtual void encode(Buffer& buffer);
virtual void decode(Buffer& buffer);
@@ -107,17 +107,17 @@
public:
IntegerValue(int v) : ValueOps<int>(v) {}
IntegerValue(){}
- virtual u_int32_t size() const { return 4; }
+ virtual uint32_t size() const { return 4; }
virtual char getType() const { return 'I'; }
virtual void encode(Buffer& buffer);
virtual void decode(Buffer& buffer);
};
-class TimeValue : public ValueOps<u_int64_t> {
+class TimeValue : public ValueOps<uint64_t> {
public:
- TimeValue(u_int64_t v) : ValueOps<u_int64_t>(v){}
+ TimeValue(uint64_t v) : ValueOps<uint64_t>(v){}
TimeValue(){}
- virtual u_int32_t size() const { return 8; }
+ virtual uint32_t size() const { return 8; }
virtual char getType() const { return 'T'; }
virtual void encode(Buffer& buffer);
virtual void decode(Buffer& buffer);
@@ -126,9 +126,9 @@
class DecimalValue : public ValueOps<Decimal> {
public:
DecimalValue(const Decimal& d) : ValueOps<Decimal>(d) {}
- DecimalValue(u_int32_t value_=0, u_int8_t decimals_=0) :
+ DecimalValue(uint32_t value_=0, uint8_t decimals_=0) :
ValueOps<Decimal>(Decimal(value_, decimals_)){}
- virtual u_int32_t size() const { return 5; }
+ virtual uint32_t size() const { return 5; }
virtual char getType() const { return 'D'; }
virtual void encode(Buffer& buffer);
virtual void decode(Buffer& buffer);
@@ -139,7 +139,7 @@
public:
FieldTableValue(const FieldTable& v) : ValueOps<FieldTable>(v){}
FieldTableValue(){}
- virtual u_int32_t size() const { return 4 + value.size(); }
+ virtual uint32_t size() const { return 4 + value.size(); }
virtual char getType() const { return 'F'; }
virtual void encode(Buffer& buffer);
virtual void decode(Buffer& buffer);
@@ -148,7 +148,7 @@
class EmptyValue : public Value {
public:
~EmptyValue();
- virtual u_int32_t size() const { return 0; }
+ virtual uint32_t size() const { return 0; }
virtual char getType() const { return 0; }
virtual void encode(Buffer& ) {}
virtual void decode(Buffer& ) {}
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/amqp_types.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/amqp_types.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/amqp_types.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/amqp_types.h Thu Mar 15 12:22:02 2007
@@ -29,10 +29,10 @@
#include <string>
#ifdef _WINDOWS
#include "windows.h"
-typedef unsigned char u_int8_t;
-typedef unsigned short u_int16_t;
-typedef unsigned int u_int32_t;
-typedef unsigned __int64 u_int64_t;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned __int64 uint64_t;
#endif
#ifndef _WINDOWS
#include "stdint.h"
@@ -42,13 +42,13 @@
namespace framing {
using std::string;
-typedef u_int16_t ChannelId;
-typedef u_int64_t RequestId;
-typedef u_int64_t ResponseId;
-typedef u_int32_t BatchOffset;
-typedef u_int16_t ClassId;
-typedef u_int16_t MethodId;
-typedef u_int16_t ReplyCode;
+typedef uint16_t ChannelId;
+typedef uint64_t RequestId;
+typedef uint64_t ResponseId;
+typedef uint32_t BatchOffset;
+typedef uint16_t ClassId;
+typedef uint16_t MethodId;
+typedef uint16_t ReplyCode;
// Types represented by classes.
class Content;
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/APRSocket.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/APRSocket.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/APRSocket.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/APRSocket.cpp Thu Mar 15 12:22:02 2007
@@ -63,7 +63,7 @@
return !closed;
}
-u_int8_t APRSocket::read(){
+uint8_t APRSocket::read(){
char data[1];
apr_size_t bytes = 1;
apr_status_t s = apr_socket_recv(socket, data, &bytes);
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/APRSocket.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/APRSocket.h?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/APRSocket.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/APRSocket.h Thu Mar 15 12:22:02 2007
@@ -37,7 +37,7 @@
void write(qpid::framing::Buffer& b);
void close();
bool isOpen() const;
- u_int8_t read();
+ uint8_t read();
~APRSocket();
};
Modified: incubator/qpid/branches/qpid.0-9/cpp/tests/AccumulatedAckTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/AccumulatedAckTest.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/AccumulatedAckTest.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/AccumulatedAckTest.cpp Thu Mar 15 12:22:02 2007
@@ -92,12 +92,12 @@
ack.update(2, 2);
ack.update(0, 5);
ack.consolidate();
- CPPUNIT_ASSERT_EQUAL((u_int64_t) 6, ack.range);
+ CPPUNIT_ASSERT_EQUAL((uint64_t) 6, ack.range);
CPPUNIT_ASSERT_EQUAL((size_t) 2, ack.individual.size());
- list<u_int64_t>::iterator i = ack.individual.begin();
- CPPUNIT_ASSERT_EQUAL((u_int64_t) 8, *i);
+ list<uint64_t>::iterator i = ack.individual.begin();
+ CPPUNIT_ASSERT_EQUAL((uint64_t) 8, *i);
i++;
- CPPUNIT_ASSERT_EQUAL((u_int64_t) 10, *i);
+ CPPUNIT_ASSERT_EQUAL((uint64_t) 10, *i);
}
};
Modified: incubator/qpid/branches/qpid.0-9/cpp/tests/BrokerChannelTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/BrokerChannelTest.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/BrokerChannelTest.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/BrokerChannelTest.cpp Thu Mar 15 12:22:02 2007
@@ -163,17 +163,17 @@
string tagB;
channel.consume(tagA, queue, false, false, owner);
channel.consume(tagB, queue, false, false, owner);
- CPPUNIT_ASSERT_EQUAL((u_int32_t) 3, queue->getConsumerCount());
+ CPPUNIT_ASSERT_EQUAL((uint32_t) 3, queue->getConsumerCount());
CPPUNIT_ASSERT(channel.exists("my_consumer"));
CPPUNIT_ASSERT(channel.exists(tagA));
CPPUNIT_ASSERT(channel.exists(tagB));
channel.cancel(tagA);
- CPPUNIT_ASSERT_EQUAL((u_int32_t) 2, queue->getConsumerCount());
+ CPPUNIT_ASSERT_EQUAL((uint32_t) 2, queue->getConsumerCount());
CPPUNIT_ASSERT(channel.exists("my_consumer"));
CPPUNIT_ASSERT(!channel.exists(tagA));
CPPUNIT_ASSERT(channel.exists(tagB));
channel.close();
- CPPUNIT_ASSERT_EQUAL((u_int32_t) 0, queue->getConsumerCount());
+ CPPUNIT_ASSERT_EQUAL((uint32_t) 0, queue->getConsumerCount());
}
void testDeliveryNoAck(){
@@ -261,7 +261,7 @@
exchange->bind(queue, "", 0);
AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC));
- u_int64_t contentSize(0);
+ uint64_t contentSize(0);
for (int i = 0; i < 3; i++) {
contentSize += data[i].size();
}
@@ -315,13 +315,13 @@
Message::shared_ptr next = queue->dequeue();
CPPUNIT_ASSERT_EQUAL(msg1, next);
- CPPUNIT_ASSERT_EQUAL((u_int32_t) data1.size(), next->encodedContentSize());
+ CPPUNIT_ASSERT_EQUAL((uint32_t) data1.size(), next->encodedContentSize());
next = queue->dequeue();
CPPUNIT_ASSERT_EQUAL(msg2, next);
- CPPUNIT_ASSERT_EQUAL((u_int32_t) data2.size(), next->encodedContentSize());
+ CPPUNIT_ASSERT_EQUAL((uint32_t) data2.size(), next->encodedContentSize());
next = queue->dequeue();
CPPUNIT_ASSERT_EQUAL(msg3, next);
- CPPUNIT_ASSERT_EQUAL((u_int32_t) 0, next->encodedContentSize());
+ CPPUNIT_ASSERT_EQUAL((uint32_t) 0, next->encodedContentSize());
next.reset();
msg1.reset();
@@ -332,7 +332,7 @@
store.check();
}
- Message* createMessage(const string& exchange, const string& routingKey, const string& messageId, u_int64_t contentSize)
+ Message* createMessage(const string& exchange, const string& routingKey, const string& messageId, uint64_t contentSize)
{
BasicMessage* msg = new BasicMessage(
0, exchange, routingKey, false, false,
Modified: incubator/qpid/branches/qpid.0-9/cpp/tests/EventChannelConnectionTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/EventChannelConnectionTest.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/EventChannelConnectionTest.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/EventChannelConnectionTest.cpp Thu Mar 15 12:22:02 2007
@@ -74,8 +74,8 @@
// Send a heartbeat frame, verify connection got it.
connection->send(new AMQFrame(42, new AMQHeartbeatBody()));
AMQFrame frame = factory.handler->waitForFrame();
- CPPUNIT_ASSERT_EQUAL(u_int16_t(42), frame.getChannel());
- CPPUNIT_ASSERT_EQUAL(u_int8_t(HEARTBEAT_BODY),
+ CPPUNIT_ASSERT_EQUAL(uint16_t(42), frame.getChannel());
+ CPPUNIT_ASSERT_EQUAL(uint8_t(HEARTBEAT_BODY),
frame.getBody()->type());
threads->shutdown();
}
Modified: incubator/qpid/branches/qpid.0-9/cpp/tests/HeaderTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/HeaderTest.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/HeaderTest.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/HeaderTest.cpp Thu Mar 15 12:22:02 2007
@@ -53,13 +53,13 @@
void testAllSpecificProperties(){
string contentType("text/html");
string contentEncoding("UTF8");
- u_int8_t deliveryMode(2);
- u_int8_t priority(3);
+ uint8_t deliveryMode(2);
+ uint8_t priority(3);
string correlationId("abc");
string replyTo("no-address");
string expiration("why is this a string?");
string messageId("xyz");
- u_int64_t timestamp(0xabcd);
+ uint64_t timestamp(0xabcd);
string type("eh?");
string userId("guest");
string appId("just testing");
@@ -106,10 +106,10 @@
void testSomeSpecificProperties(){
string contentType("application/octet-stream");
- u_int8_t deliveryMode(5);
- u_int8_t priority(6);
+ uint8_t deliveryMode(5);
+ uint8_t priority(6);
string expiration("Z");
- u_int64_t timestamp(0xabe4a34a);
+ uint64_t timestamp(0xabe4a34a);
AMQHeaderBody body(BASIC);
BasicHeaderProperties* properties =
Modified: incubator/qpid/branches/qpid.0-9/cpp/tests/InMemoryContentTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/InMemoryContentTest.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/InMemoryContentTest.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/InMemoryContentTest.cpp Thu Mar 15 12:22:02 2007
@@ -55,7 +55,7 @@
}
- void refragment(size_t inCount, string* in, size_t outCount, string* out, u_int32_t framesize = 5)
+ void refragment(size_t inCount, string* in, size_t outCount, string* out, uint32_t framesize = 5)
{
InMemoryContent content;
MockChannel channel(3);
Modified: incubator/qpid/branches/qpid.0-9/cpp/tests/LazyLoadedContentTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/LazyLoadedContentTest.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/LazyLoadedContentTest.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/LazyLoadedContentTest.cpp Thu Mar 15 12:22:02 2007
@@ -50,7 +50,7 @@
public:
TestMessageStore(const string& _content) : content(_content) {}
- void loadContent(Message* const, string& data, u_int64_t offset, u_int32_t length)
+ void loadContent(Message* const, string& data, uint64_t offset, uint32_t length)
{
if (offset + length <= content.size()) {
data = content.substr(offset, length);
@@ -67,7 +67,7 @@
void testFragmented()
{
string data = "abcdefghijklmnopqrstuvwxyz";
- u_int32_t framesize = 5;
+ uint32_t framesize = 5;
string out[] = {"abcde", "fghij", "klmno", "pqrst", "uvwxy", "z"};
load(data, 6, out, framesize);
}
@@ -75,7 +75,7 @@
void testWhole()
{
string data = "abcdefghijklmnopqrstuvwxyz";
- u_int32_t framesize = 50;
+ uint32_t framesize = 50;
string out[] = {data};
load(data, 1, out, framesize);
}
@@ -83,12 +83,12 @@
void testHalved()
{
string data = "abcdefghijklmnopqrstuvwxyz";
- u_int32_t framesize = 13;
+ uint32_t framesize = 13;
string out[] = {"abcdefghijklm", "nopqrstuvwxyz"};
load(data, 2, out, framesize);
}
- void load(string& in, size_t outCount, string* out, u_int32_t framesize)
+ void load(string& in, size_t outCount, string* out, uint32_t framesize)
{
TestMessageStore store(in);
LazyLoadedContent content(&store, 0, in.size());
Modified: incubator/qpid/branches/qpid.0-9/cpp/tests/MessageBuilderTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/MessageBuilderTest.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/MessageBuilderTest.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/MessageBuilderTest.cpp Thu Mar 15 12:22:02 2007
@@ -47,7 +47,7 @@
{
Buffer* header;
Buffer* content;
- const u_int32_t contentBufferSize;
+ const uint32_t contentBufferSize;
public:
@@ -99,7 +99,7 @@
}
//dont care about any of the other methods:
- TestMessageStore(u_int32_t _contentBufferSize) : NullMessageStore(), header(0), content(0),
+ TestMessageStore(uint32_t _contentBufferSize) : NullMessageStore(), header(0), content(0),
contentBufferSize(_contentBufferSize) {}
~TestMessageStore(){}
};
@@ -216,7 +216,7 @@
CPPUNIT_ASSERT_EQUAL(message->getHeaderProperties()->getMessageId(), restored->getHeaderProperties()->getMessageId());
CPPUNIT_ASSERT_EQUAL(message->getHeaderProperties()->getHeaders().getString("abc"),
restored->getHeaderProperties()->getHeaders().getString("abc"));
- CPPUNIT_ASSERT_EQUAL((u_int64_t) 14, restored->contentSize());
+ CPPUNIT_ASSERT_EQUAL((uint64_t) 14, restored->contentSize());
}
}
};
Modified: incubator/qpid/branches/qpid.0-9/cpp/tests/MessageTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/MessageTest.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/MessageTest.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/MessageTest.cpp Thu Mar 15 12:22:02 2007
@@ -69,9 +69,9 @@
CPPUNIT_ASSERT_EQUAL(exchange, msg->getExchange());
CPPUNIT_ASSERT_EQUAL(routingKey, msg->getRoutingKey());
CPPUNIT_ASSERT_EQUAL(messageId, msg->getHeaderProperties()->getMessageId());
- CPPUNIT_ASSERT_EQUAL((u_int8_t) PERSISTENT, msg->getHeaderProperties()->getDeliveryMode());
+ CPPUNIT_ASSERT_EQUAL((uint8_t) PERSISTENT, msg->getHeaderProperties()->getDeliveryMode());
CPPUNIT_ASSERT_EQUAL(string("xyz"), msg->getHeaderProperties()->getHeaders().getString("abc"));
- CPPUNIT_ASSERT_EQUAL((u_int64_t) 14, msg->contentSize());
+ CPPUNIT_ASSERT_EQUAL((uint64_t) 14, msg->contentSize());
MockChannel channel(1);
// FIXME aconway 2007-02-02: deliver should take ProtocolVersion
Modified: incubator/qpid/branches/qpid.0-9/cpp/tests/QueuePolicyTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/QueuePolicyTest.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/QueuePolicyTest.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/QueuePolicyTest.cpp Thu Mar 15 12:22:02 2007
@@ -38,8 +38,8 @@
QueuePolicy policy(5, 0);
CPPUNIT_ASSERT(!policy.limitExceeded());
for (int i = 0; i < 5; i++) policy.enqueued(10);
- CPPUNIT_ASSERT_EQUAL((u_int64_t) 0, policy.getMaxSize());
- CPPUNIT_ASSERT_EQUAL((u_int32_t) 5, policy.getMaxCount());
+ CPPUNIT_ASSERT_EQUAL((uint64_t) 0, policy.getMaxSize());
+ CPPUNIT_ASSERT_EQUAL((uint32_t) 5, policy.getMaxCount());
CPPUNIT_ASSERT(!policy.limitExceeded());
policy.enqueued(10);
CPPUNIT_ASSERT(policy.limitExceeded());
Modified: incubator/qpid/branches/qpid.0-9/cpp/tests/QueueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/QueueTest.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/QueueTest.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/QueueTest.cpp Thu Mar 15 12:22:02 2007
@@ -70,7 +70,7 @@
queue->consume(&c1);
queue->consume(&c2);
- CPPUNIT_ASSERT_EQUAL(u_int32_t(2), queue->getConsumerCount());
+ CPPUNIT_ASSERT_EQUAL(uint32_t(2), queue->getConsumerCount());
//Test basic delivery:
Message::shared_ptr msg1 = message("e", "A");
@@ -88,9 +88,9 @@
//Test cancellation:
queue->cancel(&c1);
- CPPUNIT_ASSERT_EQUAL(u_int32_t(1), queue->getConsumerCount());
+ CPPUNIT_ASSERT_EQUAL(uint32_t(1), queue->getConsumerCount());
queue->cancel(&c2);
- CPPUNIT_ASSERT_EQUAL(u_int32_t(0), queue->getConsumerCount());
+ CPPUNIT_ASSERT_EQUAL(uint32_t(0), queue->getConsumerCount());
}
void testBinding(){
@@ -138,25 +138,25 @@
queue->deliver(msg2);
queue->deliver(msg3);
- CPPUNIT_ASSERT_EQUAL(u_int32_t(3), queue->getMessageCount());
+ CPPUNIT_ASSERT_EQUAL(uint32_t(3), queue->getMessageCount());
received = queue->dequeue();
CPPUNIT_ASSERT_EQUAL(msg1.get(), received.get());
- CPPUNIT_ASSERT_EQUAL(u_int32_t(2), queue->getMessageCount());
+ CPPUNIT_ASSERT_EQUAL(uint32_t(2), queue->getMessageCount());
received = queue->dequeue();
CPPUNIT_ASSERT_EQUAL(msg2.get(), received.get());
- CPPUNIT_ASSERT_EQUAL(u_int32_t(1), queue->getMessageCount());
+ CPPUNIT_ASSERT_EQUAL(uint32_t(1), queue->getMessageCount());
TestConsumer consumer;
queue->consume(&consumer);
queue->dispatch();
CPPUNIT_ASSERT_EQUAL(msg3.get(), consumer.last.get());
- CPPUNIT_ASSERT_EQUAL(u_int32_t(0), queue->getMessageCount());
+ CPPUNIT_ASSERT_EQUAL(uint32_t(0), queue->getMessageCount());
received = queue->dequeue();
CPPUNIT_ASSERT(!received);
- CPPUNIT_ASSERT_EQUAL(u_int32_t(0), queue->getMessageCount());
+ CPPUNIT_ASSERT_EQUAL(uint32_t(0), queue->getMessageCount());
}
};
Modified: incubator/qpid/branches/qpid.0-9/cpp/tests/TxPublishTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/TxPublishTest.cpp?view=diff&rev=518733&r1=518732&r2=518733
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/TxPublishTest.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/TxPublishTest.cpp Thu Mar 15 12:22:02 2007
@@ -111,10 +111,10 @@
{
//ensure messages are delivered to queue
op.commit();
- CPPUNIT_ASSERT_EQUAL((u_int32_t) 1, queue1->getMessageCount());
+ CPPUNIT_ASSERT_EQUAL((uint32_t) 1, queue1->getMessageCount());
CPPUNIT_ASSERT_EQUAL(msg, queue1->dequeue());
- CPPUNIT_ASSERT_EQUAL((u_int32_t) 1, queue2->getMessageCount());
+ CPPUNIT_ASSERT_EQUAL((uint32_t) 1, queue2->getMessageCount());
CPPUNIT_ASSERT_EQUAL(msg, queue2->dequeue());
}
};