QPID-1198 (Partial): replace all uses of u_intX_t with uintX_t

Patches from Manuel Teira.
The u_int* versions are not available in the Sun header files.
In any case using only uint* is more consistent


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@680828 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 19 insertions, 19 deletions

diff --git a/qpid/cpp/src/qpid/broker/MessageDelivery.cpp b/qpid/cpp/src/qpid/broker/MessageDelivery.cpp
index f2a55e2790..a757d191e7 100644
--- a/qpid/cpp/src/qpid/broker/MessageDelivery.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageDelivery.cpp
@@ -43,11 +43,11 @@ struct BaseToken : DeliveryToken
 struct MessageDeliveryToken : BaseToken
 {
     const std::string destination;
-    const u_int8_t confirmMode;
-    const u_int8_t acquireMode;
+    const uint8_t confirmMode;
+    const uint8_t acquireMode;
     const bool isPreview;
 
-    MessageDeliveryToken(const std::string& d, u_int8_t c, u_int8_t a, bool p) : 
+    MessageDeliveryToken(const std::string& d, uint8_t c, uint8_t a, bool p) : 
         destination(d), confirmMode(c), acquireMode(a), isPreview(p) {}
 
     AMQFrame sendMethod(intrusive_ptr<Message> msg, DeliveryId /*id*/)
@@ -65,7 +65,7 @@ struct MessageDeliveryToken : BaseToken
 }
 
 DeliveryToken::shared_ptr MessageDelivery::getMessageDeliveryToken(const std::string& destination, 
-                                                                  u_int8_t confirmMode, u_int8_t acquireMode)
+                                                                  uint8_t confirmMode, uint8_t acquireMode)
 {
     return DeliveryToken::shared_ptr(new MessageDeliveryToken(destination, confirmMode, acquireMode, false));
 }
diff --git a/qpid/cpp/src/qpid/broker/MessageDelivery.h b/qpid/cpp/src/qpid/broker/MessageDelivery.h
index 6deafbf519..cfde9ee307 100644
--- a/qpid/cpp/src/qpid/broker/MessageDelivery.h
+++ b/qpid/cpp/src/qpid/broker/MessageDelivery.h
@@ -41,8 +41,8 @@ class Queue;
 class MessageDelivery {
 public:
     static boost::shared_ptr<DeliveryToken> getMessageDeliveryToken(const std::string& destination, 
-                                                                    u_int8_t confirmMode, 
-                                                                    u_int8_t acquireMode);
+                                                                    uint8_t confirmMode, 
+                                                                    uint8_t acquireMode);
 
     static void deliver(QueuedMessage& msg, framing::FrameHandler& out, 
                         DeliveryId deliveryTag, boost::shared_ptr<DeliveryToken> token, uint16_t framesize);
diff --git a/qpid/cpp/src/qpid/broker/MessageStore.h b/qpid/cpp/src/qpid/broker/MessageStore.h
index 1b9e6fe104..4c4c21dfba 100644
--- a/qpid/cpp/src/qpid/broker/MessageStore.h
+++ b/qpid/cpp/src/qpid/broker/MessageStore.h
@@ -186,7 +186,7 @@ class MessageStore : public TransactionalStore, public Recoverable {
      *
      * @param queue the name of the queue to check for outstanding AIO
      */
-    virtual u_int32_t outstandingQueueAIO(const PersistableQueue& queue) = 0;
+    virtual uint32_t outstandingQueueAIO(const PersistableQueue& queue) = 0;
 
     
     virtual ~MessageStore(){}
diff --git a/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp b/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
index 21c7f6bc02..c9528b9d98 100644
--- a/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
@@ -128,7 +128,7 @@ void MessageStoreModule::flush(const qpid::broker::PersistableQueue& queue)
     TRANSFER_EXCEPTION(store->flush(queue));
 }
 
-u_int32_t MessageStoreModule::outstandingQueueAIO(const PersistableQueue& queue)
+uint32_t MessageStoreModule::outstandingQueueAIO(const PersistableQueue& queue)
 {
     TRANSFER_EXCEPTION(return store->outstandingQueueAIO(queue));
 }
diff --git a/qpid/cpp/src/qpid/broker/MessageStoreModule.h b/qpid/cpp/src/qpid/broker/MessageStoreModule.h
index d9f9f2e344..a16ef4de21 100644
--- a/qpid/cpp/src/qpid/broker/MessageStoreModule.h
+++ b/qpid/cpp/src/qpid/broker/MessageStoreModule.h
@@ -71,7 +71,7 @@ class MessageStoreModule : public MessageStore
     void dequeue(TransactionContext* ctxt,
                  const boost::intrusive_ptr<PersistableMessage>& msg,
                  const PersistableQueue& queue);
-    u_int32_t outstandingQueueAIO(const PersistableQueue& queue);
+    uint32_t outstandingQueueAIO(const PersistableQueue& queue);
     void flush(const qpid::broker::PersistableQueue& queue);
 	 
     ~MessageStoreModule();
diff --git a/qpid/cpp/src/qpid/broker/NullMessageStore.cpp b/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
index 6fb92a2fc5..e1c7fe240d 100644
--- a/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
+++ b/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
@@ -134,7 +134,7 @@ void NullMessageStore::flush(const qpid::broker::PersistableQueue&)
 {
 }
 
-u_int32_t NullMessageStore::outstandingQueueAIO(const PersistableQueue& )
+uint32_t NullMessageStore::outstandingQueueAIO(const PersistableQueue& )
 {
     return 0;
 }
diff --git a/qpid/cpp/src/qpid/broker/NullMessageStore.h b/qpid/cpp/src/qpid/broker/NullMessageStore.h
index b537c05b5d..4b8d02d555 100644
--- a/qpid/cpp/src/qpid/broker/NullMessageStore.h
+++ b/qpid/cpp/src/qpid/broker/NullMessageStore.h
@@ -74,7 +74,7 @@ class NullMessageStore : public MessageStore
     virtual void dequeue(TransactionContext* ctxt,
                          const boost::intrusive_ptr<PersistableMessage>& msg,
                          const PersistableQueue& queue);
-    virtual u_int32_t outstandingQueueAIO(const PersistableQueue& queue);
+    virtual uint32_t outstandingQueueAIO(const PersistableQueue& queue);
     virtual void flush(const qpid::broker::PersistableQueue& queue);
     ~NullMessageStore(){}
 };
diff --git a/qpid/cpp/src/qpid/broker/SessionAdapter.cpp b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
index 59f837f1d0..a978762674 100644
--- a/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
@@ -369,7 +369,7 @@ SessionAdapter::MessageHandlerImpl::reject(const SequenceSet& transfers, uint16_
     transfers.for_each(rejectOp);
 }
 
-void SessionAdapter::MessageHandlerImpl::flow(const std::string& destination, u_int8_t unit, u_int32_t value)
+void SessionAdapter::MessageHandlerImpl::flow(const std::string& destination, uint8_t unit, uint32_t value)
 {
     if (unit == 0) {
         //message
@@ -384,7 +384,7 @@ void SessionAdapter::MessageHandlerImpl::flow(const std::string& destination, u_
     
 }
     
-void SessionAdapter::MessageHandlerImpl::setFlowMode(const std::string& destination, u_int8_t mode)
+void SessionAdapter::MessageHandlerImpl::setFlowMode(const std::string& destination, uint8_t mode)
 {
     if (mode == 0) {
         //credit
@@ -589,7 +589,7 @@ DtxGetTimeoutResult SessionAdapter::DtxHandlerImpl::getTimeout(const Xid& xid)
 
 
 void SessionAdapter::DtxHandlerImpl::setTimeout(const Xid& xid,
-                                                u_int32_t timeout)
+                                                uint32_t timeout)
 {
     getBroker().getDtxManager().setTimeout(convert(xid), timeout);
 }
diff --git a/qpid/cpp/src/qpid/client/SessionImpl.cpp b/qpid/cpp/src/qpid/client/SessionImpl.cpp
index 43ae158afe..2075ed04f3 100644
--- a/qpid/cpp/src/qpid/client/SessionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/SessionImpl.cpp
@@ -301,22 +301,22 @@ void SessionImpl::sendContent(const MethodContent& content)
 {
     AMQFrame header(content.getHeader());
     header.setFirstSegment(false);
-    u_int64_t data_length = content.getData().length();
+    uint64_t data_length = content.getData().length();
     if(data_length > 0){
         header.setLastSegment(false);
         handleOut(header);   
         /*Note: end of frame marker included in overhead but not in size*/
-        const u_int32_t frag_size = maxFrameSize - AMQFrame::frameOverhead(); 
+        const uint32_t frag_size = maxFrameSize - AMQFrame::frameOverhead(); 
 
         if(data_length < frag_size){
             AMQFrame frame(in_place<AMQContentBody>(content.getData()));
             frame.setFirstSegment(false);
             handleOut(frame);
         }else{
-            u_int32_t offset = 0;
-            u_int32_t remaining = data_length - offset;
+            uint32_t offset = 0;
+            uint32_t remaining = data_length - offset;
             while (remaining > 0) {
-                u_int32_t length = remaining > frag_size ? frag_size : remaining;
+                uint32_t length = remaining > frag_size ? frag_size : remaining;
                 string frag(content.getData().substr(offset, length));
                 AMQFrame frame(in_place<AMQContentBody>(frag));
                 frame.setFirstSegment(false);