Added POSIX equivalents to APR classes used by clients, inlined trivial calls.

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

21 files changed, 57 insertions, 57 deletions

diff --git a/cpp/test/client/client_test.cpp b/cpp/test/client/client_test.cpp
index 8e9c58179a..a872e5e772 100644
--- a/cpp/test/client/client_test.cpp
+++ b/cpp/test/client/client_test.cpp
@@ -17,13 +17,13 @@
  */
 #include <iostream>
 
-#include "qpid/QpidError.h"
-#include "qpid/client/Channel.h"
-#include "qpid/client/Connection.h"
-#include "qpid/client/Message.h"
-#include "qpid/client/MessageListener.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/framing/FieldTable.h"
+#include <qpid/QpidError.h>
+#include <qpid/client/Channel.h>
+#include <qpid/client/Connection.h>
+#include <qpid/client/Message.h>
+#include <qpid/client/MessageListener.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/framing/FieldTable.h>
 
 using namespace qpid::client;
 using namespace qpid::sys;
diff --git a/cpp/test/client/topic_listener.cpp b/cpp/test/client/topic_listener.cpp
index 9aa93bc2b5..6f0ae48d24 100644
--- a/cpp/test/client/topic_listener.cpp
+++ b/cpp/test/client/topic_listener.cpp
@@ -15,12 +15,12 @@
  * limitations under the License.
  *
  */
-#include "qpid/QpidError.h"
-#include "qpid/client/Channel.h"
-#include "qpid/client/Connection.h"
-#include "qpid/client/Exchange.h"
-#include "qpid/client/MessageListener.h"
-#include "qpid/client/Queue.h"
+#include <qpid/QpidError.h>
+#include <qpid/client/Channel.h>
+#include <qpid/client/Connection.h>
+#include <qpid/client/Exchange.h>
+#include <qpid/client/MessageListener.h>
+#include <qpid/client/Queue.h>
 #include <qpid/sys/Time.h>
 #include <iostream>
 #include <sstream>
@@ -102,7 +102,7 @@ Listener::Listener(Channel* _channel, const std::string& _responseq, bool tx) :
 
 void Listener::received(Message& message){
     if(!init){        
-        start = getTimeMsecs();
+        start = Time::now().msecs();
         count = 0;
         init = true;
     }
@@ -124,7 +124,7 @@ void Listener::shutdown(){
 }
 
 void Listener::report(){
-    int64_t finish = getTimeMsecs();
+    int64_t finish = Time::now().msecs();
     int64_t time = finish - start;
     std::stringstream reportstr;
     reportstr << "Received " << count << " messages in " << time << " ms.";
diff --git a/cpp/test/client/topic_publisher.cpp b/cpp/test/client/topic_publisher.cpp
index 1e1a91dfff..24393fac86 100644
--- a/cpp/test/client/topic_publisher.cpp
+++ b/cpp/test/client/topic_publisher.cpp
@@ -15,13 +15,13 @@
  * limitations under the License.
  *
  */
-#include "qpid/QpidError.h"
-#include "qpid/client/Channel.h"
-#include "qpid/client/Connection.h"
-#include "qpid/client/Exchange.h"
-#include "qpid/client/MessageListener.h"
-#include "qpid/client/Queue.h"
-#include "qpid/sys/Monitor.h"
+#include <qpid/QpidError.h>
+#include <qpid/client/Channel.h>
+#include <qpid/client/Connection.h>
+#include <qpid/client/Exchange.h>
+#include <qpid/client/MessageListener.h>
+#include <qpid/client/Queue.h>
+#include <qpid/sys/Monitor.h>
 #include "unistd.h"
 #include <qpid/sys/Time.h>
 #include <cstdlib>
@@ -149,7 +149,7 @@ void Publisher::waitForCompletion(int msgs){
 int64_t Publisher::publish(int msgs, int listeners, int size){
     Message msg;
     msg.setData(generateData(size));
-    int64_t start = getTimeMsecs();
+    int64_t start = Time::now().msecs();
     {
         Monitor::ScopedLock l(monitor);
         for(int i = 0; i < msgs; i++){
@@ -166,7 +166,7 @@ int64_t Publisher::publish(int msgs, int listeners, int size){
         waitForCompletion(listeners);
     }
 
-    int64_t finish(getTimeMsecs());
+    int64_t finish(Time::now().msecs());
     return finish - start; 
 }
 
diff --git a/cpp/test/unit/qpid/apr/APRBaseTest.cpp b/cpp/test/unit/qpid/apr/APRBaseTest.cpp
index a0f88f78db..76b61afc1d 100644
--- a/cpp/test/unit/qpid/apr/APRBaseTest.cpp
+++ b/cpp/test/unit/qpid/apr/APRBaseTest.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/apr/APRBase.h"
+#include <qpid/apr/APRBase.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/cpp/test/unit/qpid/broker/AccumulatedAckTest.cpp b/cpp/test/unit/qpid/broker/AccumulatedAckTest.cpp
index 6cbdaacc32..193117221c 100644
--- a/cpp/test/unit/qpid/broker/AccumulatedAckTest.cpp
+++ b/cpp/test/unit/qpid/broker/AccumulatedAckTest.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/AccumulatedAck.h"
+#include <qpid/broker/AccumulatedAck.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <list>
diff --git a/cpp/test/unit/qpid/broker/ChannelTest.cpp b/cpp/test/unit/qpid/broker/ChannelTest.cpp
index 796c949363..373325e0eb 100644
--- a/cpp/test/unit/qpid/broker/ChannelTest.cpp
+++ b/cpp/test/unit/qpid/broker/ChannelTest.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/Channel.h"
-#include "qpid/broker/Message.h"
+#include <qpid/broker/Channel.h>
+#include <qpid/broker/Message.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <memory>
diff --git a/cpp/test/unit/qpid/broker/ConfigurationTest.cpp b/cpp/test/unit/qpid/broker/ConfigurationTest.cpp
index 8fd252a9a9..5af1286057 100644
--- a/cpp/test/unit/qpid/broker/ConfigurationTest.cpp
+++ b/cpp/test/unit/qpid/broker/ConfigurationTest.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/Configuration.h"
+#include <qpid/broker/Configuration.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/cpp/test/unit/qpid/broker/ExchangeTest.cpp b/cpp/test/unit/qpid/broker/ExchangeTest.cpp
index d20b7c171a..babceeace8 100644
--- a/cpp/test/unit/qpid/broker/ExchangeTest.cpp
+++ b/cpp/test/unit/qpid/broker/ExchangeTest.cpp
@@ -16,11 +16,11 @@
  *
  */
 
-#include "qpid/broker/DeliverableMessage.h"
-#include "qpid/broker/DirectExchange.h"
-#include "qpid/broker/Exchange.h"
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/TopicExchange.h"
+#include <qpid/broker/DeliverableMessage.h>
+#include <qpid/broker/DirectExchange.h>
+#include <qpid/broker/Exchange.h>
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/TopicExchange.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp b/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp
index a57c1d8800..47bb172264 100644
--- a/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp
+++ b/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp
@@ -16,9 +16,9 @@
  *
  */
 
-#include "qpid/broker/HeadersExchange.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/framing/Value.h"
+#include <qpid/broker/HeadersExchange.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/framing/Value.h>
 #include <qpid_test_plugin.h>
 
 using namespace qpid::broker;
diff --git a/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp b/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp
index c04226647f..ed761d9702 100644
--- a/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp
+++ b/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/Message.h"
-#include "qpid/broker/MessageBuilder.h"
+#include <qpid/broker/Message.h>
+#include <qpid/broker/MessageBuilder.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <memory>
diff --git a/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp b/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp
index 59034fb7c8..32111105f5 100644
--- a/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp
+++ b/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp
@@ -1,4 +1,4 @@
-#include "qpid/broker/QueueRegistry.h"
+#include <qpid/broker/QueueRegistry.h>
 #include <qpid_test_plugin.h>
 #include <string>
 
diff --git a/cpp/test/unit/qpid/broker/QueueTest.cpp b/cpp/test/unit/qpid/broker/QueueTest.cpp
index ee64854dbb..903e045b89 100644
--- a/cpp/test/unit/qpid/broker/QueueTest.cpp
+++ b/cpp/test/unit/qpid/broker/QueueTest.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/QueueRegistry.h"
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/QueueRegistry.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp b/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
index 6a15573e51..681539223b 100644
--- a/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
+++ b/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
@@ -1,4 +1,4 @@
-#include "qpid/broker/TopicExchange.h"
+#include <qpid/broker/TopicExchange.h>
 #include <qpid_test_plugin.h>
 
 using namespace qpid::broker;
diff --git a/cpp/test/unit/qpid/broker/TxAckTest.cpp b/cpp/test/unit/qpid/broker/TxAckTest.cpp
index b6f8fbc1a1..c94cb717f8 100644
--- a/cpp/test/unit/qpid/broker/TxAckTest.cpp
+++ b/cpp/test/unit/qpid/broker/TxAckTest.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/MessageStore.h"
-#include "qpid/broker/QueueRegistry.h"
-#include "qpid/broker/TxAck.h"
+#include <qpid/broker/MessageStore.h>
+#include <qpid/broker/QueueRegistry.h>
+#include <qpid/broker/TxAck.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <list>
diff --git a/cpp/test/unit/qpid/broker/TxBufferTest.cpp b/cpp/test/unit/qpid/broker/TxBufferTest.cpp
index e9c531fad1..f95644e34f 100644
--- a/cpp/test/unit/qpid/broker/TxBufferTest.cpp
+++ b/cpp/test/unit/qpid/broker/TxBufferTest.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/TxBuffer.h"
+#include <qpid/broker/TxBuffer.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <vector>
diff --git a/cpp/test/unit/qpid/broker/TxPublishTest.cpp b/cpp/test/unit/qpid/broker/TxPublishTest.cpp
index a3a72b9475..b1f0b5a289 100644
--- a/cpp/test/unit/qpid/broker/TxPublishTest.cpp
+++ b/cpp/test/unit/qpid/broker/TxPublishTest.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/MessageStore.h"
-#include "qpid/broker/QueueRegistry.h"
-#include "qpid/broker/TxPublish.h"
+#include <qpid/broker/MessageStore.h>
+#include <qpid/broker/QueueRegistry.h>
+#include <qpid/broker/TxPublish.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <list>
diff --git a/cpp/test/unit/qpid/broker/ValueTest.cpp b/cpp/test/unit/qpid/broker/ValueTest.cpp
index 8ea536f59f..ae30aebfdd 100644
--- a/cpp/test/unit/qpid/broker/ValueTest.cpp
+++ b/cpp/test/unit/qpid/broker/ValueTest.cpp
@@ -1,4 +1,4 @@
-#include "qpid/framing/Value.h"
+#include <qpid/framing/Value.h>
 #include <qpid_test_plugin.h>
 
 using namespace qpid::framing;
diff --git a/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp b/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp
index d6edf37d51..c8e3012558 100644
--- a/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp
+++ b/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp
@@ -16,8 +16,8 @@
  *
  */
 #include <iostream>
-#include "qpid/framing/amqp_framing.h"
-#include "qpid_test_plugin.h"
+#include <qpid/framing/amqp_framing.h>
+#include <qpid_test_plugin.h>
 using namespace qpid::framing;
 
 class BodyHandlerTest : public CppUnit::TestCase  
diff --git a/cpp/test/unit/qpid/framing/FieldTableTest.cpp b/cpp/test/unit/qpid/framing/FieldTableTest.cpp
index b11addfd0e..ea28b570d1 100644
--- a/cpp/test/unit/qpid/framing/FieldTableTest.cpp
+++ b/cpp/test/unit/qpid/framing/FieldTableTest.cpp
@@ -16,7 +16,7 @@
  *
  */
 #include <iostream>
-#include "qpid/framing/amqp_framing.h"
+#include <qpid/framing/amqp_framing.h>
 #include <qpid_test_plugin.h>
 
 using namespace qpid::framing;
diff --git a/cpp/test/unit/qpid/framing/FramingTest.cpp b/cpp/test/unit/qpid/framing/FramingTest.cpp
index ad2d651fe0..cfa5b4814e 100644
--- a/cpp/test/unit/qpid/framing/FramingTest.cpp
+++ b/cpp/test/unit/qpid/framing/FramingTest.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/ConnectionRedirectBody.h"
-#include "qpid/framing/amqp_framing.h"
+#include <qpid/framing/ConnectionRedirectBody.h>
+#include <qpid/framing/amqp_framing.h>
 #include <iostream>
 #include <qpid_test_plugin.h>
 #include <sstream>
diff --git a/cpp/test/unit/qpid/framing/HeaderTest.cpp b/cpp/test/unit/qpid/framing/HeaderTest.cpp
index 8b613127b1..04af80acc8 100644
--- a/cpp/test/unit/qpid/framing/HeaderTest.cpp
+++ b/cpp/test/unit/qpid/framing/HeaderTest.cpp
@@ -16,7 +16,7 @@
  *
  */
 #include <iostream>
-#include "qpid/framing/amqp_framing.h"
+#include <qpid/framing/amqp_framing.h>
 #include <qpid_test_plugin.h>
 
 using namespace qpid::framing;