Changed u_int<n>_t to uint<n>_t for posix compliance.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@518733 13f79535-47bb-0310-9956-ffa450edef68

30 files changed, 183 insertions, 183 deletions

diff --git a/cpp/lib/common/framing/AMQBody.h b/cpp/lib/common/framing/AMQBody.h
index 8b8e1a729d..26076956ca 100644
--- a/cpp/lib/common/framing/AMQBody.h
+++ b/cpp/lib/common/framing/AMQBody.h
@@ -34,10 +34,10 @@ namespace qpid {
             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;
         };
diff --git a/cpp/lib/common/framing/AMQContentBody.cpp b/cpp/lib/common/framing/AMQContentBody.cpp
index 4f51dca243..573c17dade 100644
--- a/cpp/lib/common/framing/AMQContentBody.cpp
+++ b/cpp/lib/common/framing/AMQContentBody.cpp
@@ -27,13 +27,13 @@ qpid::framing::AMQContentBody::AMQContentBody(){
 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);
 }
 
diff --git a/cpp/lib/common/framing/AMQContentBody.h b/cpp/lib/common/framing/AMQContentBody.h
index a324f1ab21..c9fa7cde5c 100644
--- a/cpp/lib/common/framing/AMQContentBody.h
+++ b/cpp/lib/common/framing/AMQContentBody.h
@@ -38,11 +38,11 @@ public:
     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;
 };
 
diff --git a/cpp/lib/common/framing/AMQDataBlock.h b/cpp/lib/common/framing/AMQDataBlock.h
index ac91c52164..2a6f843f1e 100644
--- a/cpp/lib/common/framing/AMQDataBlock.h
+++ b/cpp/lib/common/framing/AMQDataBlock.h
@@ -32,7 +32,7 @@ public:
     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;
 };
 
 }
diff --git a/cpp/lib/common/framing/AMQFrame.cpp b/cpp/lib/common/framing/AMQFrame.cpp
index 4e061af2e1..bc9061b169 100644
--- a/cpp/lib/common/framing/AMQFrame.cpp
+++ b/cpp/lib/common/framing/AMQFrame.cpp
@@ -39,17 +39,17 @@ version(_version)
      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 @@ void AMQFrame::encode(Buffer& buffer)
     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 @@ bool AMQFrame::decode(Buffer& buffer)
     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();
diff --git a/cpp/lib/common/framing/AMQFrame.h b/cpp/lib/common/framing/AMQFrame.h
index 4e49b8871f..0c18e0c2a5 100644
--- a/cpp/lib/common/framing/AMQFrame.h
+++ b/cpp/lib/common/framing/AMQFrame.h
@@ -42,13 +42,13 @@ class AMQFrame : public AMQDataBlock
 {
   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 @@ class AMQFrame : public AMQDataBlock
         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;
             
 
diff --git a/cpp/lib/common/framing/AMQHeaderBody.cpp b/cpp/lib/common/framing/AMQHeaderBody.cpp
index 3653073f29..3ddae4eebf 100644
--- a/cpp/lib/common/framing/AMQHeaderBody.cpp
+++ b/cpp/lib/common/framing/AMQHeaderBody.cpp
@@ -33,7 +33,7 @@ qpid::framing::AMQHeaderBody::~AMQHeaderBody(){
     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 @@ void qpid::framing::AMQHeaderBody::encode(Buffer& buffer) const {
     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);
diff --git a/cpp/lib/common/framing/AMQHeaderBody.h b/cpp/lib/common/framing/AMQHeaderBody.h
index 77f56d9a93..d57f93aacd 100644
--- a/cpp/lib/common/framing/AMQHeaderBody.h
+++ b/cpp/lib/common/framing/AMQHeaderBody.h
@@ -32,8 +32,8 @@ namespace framing {
 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 @@ public:
 
     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;
 };
 
diff --git a/cpp/lib/common/framing/AMQHeartbeatBody.h b/cpp/lib/common/framing/AMQHeartbeatBody.h
index 20a954c468..a3e9d823f1 100644
--- a/cpp/lib/common/framing/AMQHeartbeatBody.h
+++ b/cpp/lib/common/framing/AMQHeartbeatBody.h
@@ -34,10 +34,10 @@ public:
     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;
 };
 
diff --git a/cpp/lib/common/framing/AMQMethodBody.cpp b/cpp/lib/common/framing/AMQMethodBody.cpp
index ab1e15f845..23502068f5 100644
--- a/cpp/lib/common/framing/AMQMethodBody.cpp
+++ b/cpp/lib/common/framing/AMQMethodBody.cpp
@@ -52,7 +52,7 @@ void AMQMethodBody::ClassMethodId::decode(Buffer& buffer) {
     methodId = buffer.getShort();
 }
 
-void AMQMethodBody::decode(Buffer& buffer, u_int32_t /*size*/) {
+void AMQMethodBody::decode(Buffer& buffer, uint32_t /*size*/) {
     decodeContent(buffer);
 }
 
diff --git a/cpp/lib/common/framing/AMQMethodBody.h b/cpp/lib/common/framing/AMQMethodBody.h
index 9b39a3d721..c2b00c2169 100644
--- a/cpp/lib/common/framing/AMQMethodBody.h
+++ b/cpp/lib/common/framing/AMQMethodBody.h
@@ -42,11 +42,11 @@ class AMQMethodBody : public AMQBody
         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 @@ class AMQMethodBody : public AMQBody
     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);
     };
     
diff --git a/cpp/lib/common/framing/AMQRequestBody.h b/cpp/lib/common/framing/AMQRequestBody.h
index d9eb78c26f..e184fff1d6 100644
--- a/cpp/lib/common/framing/AMQRequestBody.h
+++ b/cpp/lib/common/framing/AMQRequestBody.h
@@ -53,7 +53,7 @@ class AMQRequestBody : public AMQMethodBody
     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 @@ class AMQRequestBody : public AMQMethodBody
 
     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:
diff --git a/cpp/lib/common/framing/AMQResponseBody.h b/cpp/lib/common/framing/AMQResponseBody.h
index 5ed76ff67d..fa381baddd 100644
--- a/cpp/lib/common/framing/AMQResponseBody.h
+++ b/cpp/lib/common/framing/AMQResponseBody.h
@@ -41,9 +41,9 @@ class AMQResponseBody : public AMQMethodBody
         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 @@ class AMQResponseBody : public AMQMethodBody
         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 @@ class AMQResponseBody : public AMQMethodBody
 
     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:
diff --git a/cpp/lib/common/framing/BasicHeaderProperties.cpp b/cpp/lib/common/framing/BasicHeaderProperties.cpp
index f673215536..930ec9f4dd 100644
--- a/cpp/lib/common/framing/BasicHeaderProperties.cpp
+++ b/cpp/lib/common/framing/BasicHeaderProperties.cpp
@@ -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 @@ u_int32_t qpid::framing::BasicHeaderProperties::size() const{
 }
 
 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 @@ void qpid::framing::BasicHeaderProperties::encode(qpid::framing::Buffer& buffer)
     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 @@ void qpid::framing::BasicHeaderProperties::decode(qpid::framing::Buffer& buffer,
     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);
diff --git a/cpp/lib/common/framing/BasicHeaderProperties.h b/cpp/lib/common/framing/BasicHeaderProperties.h
index bcd81b4776..1f3fd31250 100644
--- a/cpp/lib/common/framing/BasicHeaderProperties.h
+++ b/cpp/lib/common/framing/BasicHeaderProperties.h
@@ -36,39 +36,39 @@ namespace framing {
 	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 @@ namespace framing {
 	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; }
diff --git a/cpp/lib/common/framing/Buffer.cpp b/cpp/lib/common/framing/Buffer.cpp
index 43815c2f1d..52c9a42d55 100644
--- a/cpp/lib/common/framing/Buffer.cpp
+++ b/cpp/lib/common/framing/Buffer.cpp
@@ -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::clear(){
 }
 
 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 @@ void qpid::framing::Buffer::restore(){
     limit = r_limit;
 }
 
-u_int32_t qpid::framing::Buffer::available(){
+uint32_t qpid::framing::Buffer::available(){
     return limit - position;
 }
 
@@ -69,51 +69,51 @@ char* qpid::framing::Buffer::start(){
     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::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(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::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(u_int64_t i){
-    u_int32_t hi = i >> 32;
-    u_int32_t lo = i;
+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 @@ u_int32_t qpid::framing::Buffer::getLong(){
     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::getContent(Content& c){
 }
 
 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;
 }
diff --git a/cpp/lib/common/framing/Buffer.h b/cpp/lib/common/framing/Buffer.h
index f2dd5071a7..63a15c7c3d 100644
--- a/cpp/lib/common/framing/Buffer.h
+++ b/cpp/lib/common/framing/Buffer.h
@@ -31,18 +31,18 @@ class FieldTable;
 
 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 @@ public:
     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);
+    void putOctet(uint8_t i);
+    void putShort(uint16_t i);
+    void putLong(uint32_t i);
+    void putLongLong(uint64_t i);
 
-    u_int8_t getOctet();
-    u_int16_t getShort(); 
-    u_int32_t getLong();
-    u_int64_t getLongLong();
+    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 @@ public:
     void getContent(Content& c);
 
     void putRawData(const string& s);
-    void getRawData(string& s, u_int32_t size);
+    void getRawData(string& s, uint32_t size);
 
 };
 
diff --git a/cpp/lib/common/framing/FieldTable.cpp b/cpp/lib/common/framing/FieldTable.cpp
index cf16e87272..5bbc4651d3 100644
--- a/cpp/lib/common/framing/FieldTable.cpp
+++ b/cpp/lib/common/framing/FieldTable.cpp
@@ -29,8 +29,8 @@ namespace framing {
 
 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 @@ void FieldTable::setInt(const std::string& name, int value){
     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 @@ void FieldTable::setTable(const std::string& name, const FieldTable& value){
 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 @@ int FieldTable::getInt(const std::string& name) const {
     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::encode(Buffer& buffer) const{
 }
 
 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);
diff --git a/cpp/lib/common/framing/FieldTable.h b/cpp/lib/common/framing/FieldTable.h
index 6fa10ab108..e25a7d3f8c 100644
--- a/cpp/lib/common/framing/FieldTable.h
+++ b/cpp/lib/common/framing/FieldTable.h
@@ -50,16 +50,16 @@ class FieldTable
     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);
diff --git a/cpp/lib/common/framing/FramingContent.cpp b/cpp/lib/common/framing/FramingContent.cpp
index 45335ba9c9..24efa38dcb 100644
--- a/cpp/lib/common/framing/FramingContent.cpp
+++ b/cpp/lib/common/framing/FramingContent.cpp
@@ -30,7 +30,7 @@ namespace framing {
 
 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();
 }
 
diff --git a/cpp/lib/common/framing/FramingContent.h b/cpp/lib/common/framing/FramingContent.h
index cffd46ee24..696bcc7c1a 100644
--- a/cpp/lib/common/framing/FramingContent.h
+++ b/cpp/lib/common/framing/FramingContent.h
@@ -14,14 +14,14 @@ enum discriminator_types { INLINE = 0, REFERENCE = 1 };
  */
 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;
diff --git a/cpp/lib/common/framing/HeaderProperties.h b/cpp/lib/common/framing/HeaderProperties.h
index 7a8c65549d..1ec4840309 100644
--- a/cpp/lib/common/framing/HeaderProperties.h
+++ b/cpp/lib/common/framing/HeaderProperties.h
@@ -34,10 +34,10 @@ namespace framing {
 	
     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;
     };
 }
 }
diff --git a/cpp/lib/common/framing/ProtocolInitiation.cpp b/cpp/lib/common/framing/ProtocolInitiation.cpp
index c119b79d6d..de53488f7b 100644
--- a/cpp/lib/common/framing/ProtocolInitiation.cpp
+++ b/cpp/lib/common/framing/ProtocolInitiation.cpp
@@ -25,7 +25,7 @@ namespace framing {
 
 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) {}
 
diff --git a/cpp/lib/common/framing/ProtocolInitiation.h b/cpp/lib/common/framing/ProtocolInitiation.h
index fb5cb3abed..ed7b59e94e 100644
--- a/cpp/lib/common/framing/ProtocolInitiation.h
+++ b/cpp/lib/common/framing/ProtocolInitiation.h
@@ -36,14 +36,14 @@ private:
         
 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; }
 };
 
diff --git a/cpp/lib/common/framing/ProtocolVersion.h b/cpp/lib/common/framing/ProtocolVersion.h
index aa526aa293..5e1429c1ea 100644
--- a/cpp/lib/common/framing/ProtocolVersion.h
+++ b/cpp/lib/common/framing/ProtocolVersion.h
@@ -31,17 +31,17 @@ namespace framing
 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); 
diff --git a/cpp/lib/common/framing/Value.cpp b/cpp/lib/common/framing/Value.cpp
index 9b1f3bbc94..03e005e384 100644
--- a/cpp/lib/common/framing/Value.cpp
+++ b/cpp/lib/common/framing/Value.cpp
@@ -37,7 +37,7 @@ void StringValue::decode(Buffer& buffer){
 }
 
 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 @@ void FieldTableValue::decode(Buffer& buffer){
 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());
diff --git a/cpp/lib/common/framing/Value.h b/cpp/lib/common/framing/Value.h
index e7ae865a70..8752b02f40 100644
--- a/cpp/lib/common/framing/Value.h
+++ b/cpp/lib/common/framing/Value.h
@@ -36,10 +36,10 @@ class Buffer;
  * 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 @@ std::ostream& operator<<(std::ostream& out, const Decimal& d);
 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 @@ class StringValue : public ValueOps<std::string> {
   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 @@ class IntegerValue : public ValueOps<int> {
   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 TimeValue : public ValueOps<u_int64_t> {
 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 @@ class FieldTableValue : public ValueOps<FieldTable> {
   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 FieldTableValue : public ValueOps<FieldTable> {
 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& ) {}
diff --git a/cpp/lib/common/framing/amqp_types.h b/cpp/lib/common/framing/amqp_types.h
index 2f56cb877e..49963bd570 100644
--- a/cpp/lib/common/framing/amqp_types.h
+++ b/cpp/lib/common/framing/amqp_types.h
@@ -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 qpid {
 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;
diff --git a/cpp/lib/common/sys/apr/APRSocket.cpp b/cpp/lib/common/sys/apr/APRSocket.cpp
index 621a66b919..96dbd132a1 100644
--- a/cpp/lib/common/sys/apr/APRSocket.cpp
+++ b/cpp/lib/common/sys/apr/APRSocket.cpp
@@ -63,7 +63,7 @@ bool APRSocket::isOpen() const {
     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);
diff --git a/cpp/lib/common/sys/apr/APRSocket.h b/cpp/lib/common/sys/apr/APRSocket.h
index d4274300f2..a55dfc06b0 100644
--- a/cpp/lib/common/sys/apr/APRSocket.h
+++ b/cpp/lib/common/sys/apr/APRSocket.h
@@ -37,7 +37,7 @@ namespace sys {
         void write(qpid::framing::Buffer& b);
         void close();
         bool isOpen() const;
-        u_int8_t read();
+        uint8_t read();
 	~APRSocket();
     };