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

11 files changed, 43 insertions, 43 deletions

diff --git a/cpp/tests/AccumulatedAckTest.cpp b/cpp/tests/AccumulatedAckTest.cpp
index d00977b69e..30554f808e 100644
--- a/cpp/tests/AccumulatedAckTest.cpp
+++ b/cpp/tests/AccumulatedAckTest.cpp
@@ -92,12 +92,12 @@ class AccumulatedAckTest : public CppUnit::TestCase
             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);
         }
 };
 
diff --git a/cpp/tests/BrokerChannelTest.cpp b/cpp/tests/BrokerChannelTest.cpp
index bd96d554b4..9216ae4672 100644
--- a/cpp/tests/BrokerChannelTest.cpp
+++ b/cpp/tests/BrokerChannelTest.cpp
@@ -163,17 +163,17 @@ class BrokerChannelTest : public CppUnit::TestCase
         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 @@ class BrokerChannelTest : public CppUnit::TestCase
         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 @@ class BrokerChannelTest : public CppUnit::TestCase
         
         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 @@ class BrokerChannelTest : public CppUnit::TestCase
         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,
diff --git a/cpp/tests/EventChannelConnectionTest.cpp b/cpp/tests/EventChannelConnectionTest.cpp
index 5e94b07dbd..66561daf83 100644
--- a/cpp/tests/EventChannelConnectionTest.cpp
+++ b/cpp/tests/EventChannelConnectionTest.cpp
@@ -74,8 +74,8 @@ class EventChannelConnectionTest : public CppUnit::TestCase
         // 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();
     }
diff --git a/cpp/tests/HeaderTest.cpp b/cpp/tests/HeaderTest.cpp
index 01927c7190..f77aaaedb4 100644
--- a/cpp/tests/HeaderTest.cpp
+++ b/cpp/tests/HeaderTest.cpp
@@ -53,13 +53,13 @@ public:
     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 @@ public:
 
     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 = 
diff --git a/cpp/tests/InMemoryContentTest.cpp b/cpp/tests/InMemoryContentTest.cpp
index c8433432e8..d02cc56a7b 100644
--- a/cpp/tests/InMemoryContentTest.cpp
+++ b/cpp/tests/InMemoryContentTest.cpp
@@ -55,7 +55,7 @@ public:
     }
 
 
-    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);
diff --git a/cpp/tests/LazyLoadedContentTest.cpp b/cpp/tests/LazyLoadedContentTest.cpp
index 365e4f6a11..b24cd5a84a 100644
--- a/cpp/tests/LazyLoadedContentTest.cpp
+++ b/cpp/tests/LazyLoadedContentTest.cpp
@@ -50,7 +50,7 @@ class LazyLoadedContentTest : public CppUnit::TestCase
     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 @@ public:
     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 @@ public:
     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 @@ public:
     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());
diff --git a/cpp/tests/MessageBuilderTest.cpp b/cpp/tests/MessageBuilderTest.cpp
index d1b9c6ee62..d3b3902e97 100644
--- a/cpp/tests/MessageBuilderTest.cpp
+++ b/cpp/tests/MessageBuilderTest.cpp
@@ -47,7 +47,7 @@ class MessageBuilderTest : public CppUnit::TestCase
     {
         Buffer* header;
         Buffer* content;
-        const u_int32_t contentBufferSize;
+        const uint32_t contentBufferSize;
         
       public:
 
@@ -99,7 +99,7 @@ class MessageBuilderTest : public CppUnit::TestCase
         }
         
         //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 @@ class MessageBuilderTest : public CppUnit::TestCase
             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());
         }
     }
 };
diff --git a/cpp/tests/MessageTest.cpp b/cpp/tests/MessageTest.cpp
index 95f1a9b90a..a3bbfe4afc 100644
--- a/cpp/tests/MessageTest.cpp
+++ b/cpp/tests/MessageTest.cpp
@@ -69,9 +69,9 @@ class MessageTest : public CppUnit::TestCase
         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
diff --git a/cpp/tests/QueuePolicyTest.cpp b/cpp/tests/QueuePolicyTest.cpp
index 0ae0d2f7bc..20917dcd6a 100644
--- a/cpp/tests/QueuePolicyTest.cpp
+++ b/cpp/tests/QueuePolicyTest.cpp
@@ -38,8 +38,8 @@ class QueuePolicyTest : public CppUnit::TestCase
         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());
diff --git a/cpp/tests/QueueTest.cpp b/cpp/tests/QueueTest.cpp
index 59ca7728ca..fa38029de1 100644
--- a/cpp/tests/QueueTest.cpp
+++ b/cpp/tests/QueueTest.cpp
@@ -70,7 +70,7 @@ class QueueTest : public CppUnit::TestCase
         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 @@ class QueueTest : public CppUnit::TestCase
     
         //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 @@ class QueueTest : public CppUnit::TestCase
         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());
         
     }
 };
diff --git a/cpp/tests/TxPublishTest.cpp b/cpp/tests/TxPublishTest.cpp
index 39d27a754d..d9d5607c06 100644
--- a/cpp/tests/TxPublishTest.cpp
+++ b/cpp/tests/TxPublishTest.cpp
@@ -111,10 +111,10 @@ public:
     {
         //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());            
     }
 };