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

18 files changed, 55 insertions, 55 deletions

diff --git a/cpp/src/qpid/client/Channel.cpp b/cpp/src/qpid/client/Channel.cpp
index fad648f27d..bf02cb3677 100644
--- a/cpp/src/qpid/client/Channel.cpp
+++ b/cpp/src/qpid/client/Channel.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "qpid/client/Channel.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/client/Message.h"
-#include "qpid/QpidError.h"
+#include <qpid/client/Channel.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/client/Message.h>
+#include <qpid/QpidError.h>
 
 using namespace boost;          //to use dynamic_pointer_cast
 using namespace qpid::client;
diff --git a/cpp/src/qpid/client/Channel.h b/cpp/src/qpid/client/Channel.h
index daf2b6f9d9..6a6c9ce800 100644
--- a/cpp/src/qpid/client/Channel.h
+++ b/cpp/src/qpid/client/Channel.h
@@ -23,15 +23,15 @@
 #ifndef _Channel_
 #define _Channel_
 
-#include "qpid/framing/amqp_framing.h"
-#include "qpid/client/Connection.h"
-#include "qpid/client/Exchange.h"
-#include "qpid/client/IncomingMessage.h"
-#include "qpid/client/Message.h"
-#include "qpid/client/MessageListener.h"
-#include "qpid/client/Queue.h"
-#include "qpid/client/ResponseHandler.h"
-#include "qpid/client/ReturnedMessageHandler.h"
+#include <qpid/framing/amqp_framing.h>
+#include <qpid/client/Connection.h>
+#include <qpid/client/Exchange.h>
+#include <qpid/client/IncomingMessage.h>
+#include <qpid/client/Message.h>
+#include <qpid/client/MessageListener.h>
+#include <qpid/client/Queue.h>
+#include <qpid/client/ResponseHandler.h>
+#include <qpid/client/ReturnedMessageHandler.h>
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/qpid/client/Connection.cpp b/cpp/src/qpid/client/Connection.cpp
index 21c514127d..b683ae1dec 100644
--- a/cpp/src/qpid/client/Connection.cpp
+++ b/cpp/src/qpid/client/Connection.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "qpid/client/Connection.h"
-#include "qpid/client/Channel.h"
-#include "qpid/client/Message.h"
-#include "qpid/QpidError.h"
+#include <qpid/client/Connection.h>
+#include <qpid/client/Channel.h>
+#include <qpid/client/Message.h>
+#include <qpid/QpidError.h>
 #include <iostream>
 
 using namespace qpid::client;
diff --git a/cpp/src/qpid/client/Connection.h b/cpp/src/qpid/client/Connection.h
index 4ff4e83859..fadd50cd97 100644
--- a/cpp/src/qpid/client/Connection.h
+++ b/cpp/src/qpid/client/Connection.h
@@ -21,18 +21,18 @@
 #ifndef _Connection_
 #define _Connection_
 
-#include "qpid/QpidError.h"
-#include "qpid/client/Connector.h"
-#include "qpid/sys/ShutdownHandler.h"
-#include "qpid/sys/TimeoutHandler.h"
-
-#include "qpid/framing/amqp_framing.h"
-#include "qpid/client/Exchange.h"
-#include "qpid/client/IncomingMessage.h"
-#include "qpid/client/Message.h"
-#include "qpid/client/MessageListener.h"
-#include "qpid/client/Queue.h"
-#include "qpid/client/ResponseHandler.h"
+#include <qpid/QpidError.h>
+#include <qpid/client/Connector.h>
+#include <qpid/sys/ShutdownHandler.h>
+#include <qpid/sys/TimeoutHandler.h>
+
+#include <qpid/framing/amqp_framing.h>
+#include <qpid/client/Exchange.h>
+#include <qpid/client/IncomingMessage.h>
+#include <qpid/client/Message.h>
+#include <qpid/client/MessageListener.h>
+#include <qpid/client/Queue.h>
+#include <qpid/client/ResponseHandler.h>
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/qpid/client/Connector.cpp b/cpp/src/qpid/client/Connector.cpp
index 5d3a20be6a..6d8cae1169 100644
--- a/cpp/src/qpid/client/Connector.cpp
+++ b/cpp/src/qpid/client/Connector.cpp
@@ -89,7 +89,7 @@ void Connector::writeToSocket(char* data, size_t available){
     while(written < available && !closed){
 	ssize_t sent = socket.send(data + written, available-written);
         if(sent > 0) {
-            lastOut = getTimeMsecs();
+            lastOut = Time::now().msecs();
             written += sent;
         }
     }
@@ -97,7 +97,7 @@ void Connector::writeToSocket(char* data, size_t available){
 
 void Connector::checkIdle(ssize_t status){
     if(timeoutHandler){
-        int64_t now = getTimeMsecs();
+        int64_t now = Time::now().msecs();
         if(status == Socket::SOCKET_TIMEOUT) {
             if(idleIn && (now - lastIn > idleIn)){
                 timeoutHandler->idleIn();
diff --git a/cpp/src/qpid/client/Connector.h b/cpp/src/qpid/client/Connector.h
index 91ec58c95c..0b3ba43201 100644
--- a/cpp/src/qpid/client/Connector.h
+++ b/cpp/src/qpid/client/Connector.h
@@ -19,14 +19,14 @@
 #define _Connector_
 
 
-#include "qpid/framing/InputHandler.h"
-#include "qpid/framing/OutputHandler.h"
-#include "qpid/framing/InitiationHandler.h"
-#include "qpid/framing/ProtocolInitiation.h"
-#include "qpid/sys/ShutdownHandler.h"
-#include "qpid/sys/TimeoutHandler.h"
-#include "qpid/sys/Thread.h"
-#include "qpid/sys/Monitor.h"
+#include <qpid/framing/InputHandler.h>
+#include <qpid/framing/OutputHandler.h>
+#include <qpid/framing/InitiationHandler.h>
+#include <qpid/framing/ProtocolInitiation.h>
+#include <qpid/sys/ShutdownHandler.h>
+#include <qpid/sys/TimeoutHandler.h>
+#include <qpid/sys/Thread.h>
+#include <qpid/sys/Monitor.h>
 #include <qpid/sys/Socket.h>
 
 namespace qpid {
diff --git a/cpp/src/qpid/client/Exchange.cpp b/cpp/src/qpid/client/Exchange.cpp
index 078f15c3a7..e2af7440b1 100644
--- a/cpp/src/qpid/client/Exchange.cpp
+++ b/cpp/src/qpid/client/Exchange.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/client/Exchange.h"
+#include <qpid/client/Exchange.h>
 
 qpid::client::Exchange::Exchange(std::string _name, std::string _type) : name(_name), type(_type){}
 const std::string& qpid::client::Exchange::getName() const { return name; }
diff --git a/cpp/src/qpid/client/IncomingMessage.cpp b/cpp/src/qpid/client/IncomingMessage.cpp
index c385430a27..af874bc7a2 100644
--- a/cpp/src/qpid/client/IncomingMessage.cpp
+++ b/cpp/src/qpid/client/IncomingMessage.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/client/IncomingMessage.h"
-#include "qpid/QpidError.h"
+#include <qpid/client/IncomingMessage.h>
+#include <qpid/QpidError.h>
 #include <iostream>
 
 using namespace qpid::client;
diff --git a/cpp/src/qpid/client/IncomingMessage.h b/cpp/src/qpid/client/IncomingMessage.h
index fec620066b..e9426d0259 100644
--- a/cpp/src/qpid/client/IncomingMessage.h
+++ b/cpp/src/qpid/client/IncomingMessage.h
@@ -17,12 +17,12 @@
  */
 #include <string>
 #include <vector>
-#include "qpid/framing/amqp_framing.h"
+#include <qpid/framing/amqp_framing.h>
 
 #ifndef _IncomingMessage_
 #define _IncomingMessage_
 
-#include "qpid/client/Message.h"
+#include <qpid/client/Message.h>
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/qpid/client/Message.cpp b/cpp/src/qpid/client/Message.cpp
index 34220b595d..7a90bce79d 100644
--- a/cpp/src/qpid/client/Message.cpp
+++ b/cpp/src/qpid/client/Message.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/client/Message.h"
+#include <qpid/client/Message.h>
 
 using namespace qpid::client;
 using namespace qpid::framing;
diff --git a/cpp/src/qpid/client/Message.h b/cpp/src/qpid/client/Message.h
index 5b1c1d5de7..8a5399444b 100644
--- a/cpp/src/qpid/client/Message.h
+++ b/cpp/src/qpid/client/Message.h
@@ -16,7 +16,7 @@
  *
  */
 #include <string>
-#include "qpid/framing/amqp_framing.h"
+#include <qpid/framing/amqp_framing.h>
 
 #ifndef _Message_
 #define _Message_
diff --git a/cpp/src/qpid/client/MessageListener.cpp b/cpp/src/qpid/client/MessageListener.cpp
index f3bcb24c1a..756f12efef 100644
--- a/cpp/src/qpid/client/MessageListener.cpp
+++ b/cpp/src/qpid/client/MessageListener.cpp
@@ -16,6 +16,6 @@
  *
  */
 
-#include "qpid/client/MessageListener.h"
+#include <qpid/client/MessageListener.h>
 
 qpid::client::MessageListener::~MessageListener() {}
diff --git a/cpp/src/qpid/client/MessageListener.h b/cpp/src/qpid/client/MessageListener.h
index a28e26a8d2..a249af7f01 100644
--- a/cpp/src/qpid/client/MessageListener.h
+++ b/cpp/src/qpid/client/MessageListener.h
@@ -20,7 +20,7 @@
 #ifndef _MessageListener_
 #define _MessageListener_
 
-#include "qpid/client/Message.h"
+#include <qpid/client/Message.h>
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/qpid/client/Queue.cpp b/cpp/src/qpid/client/Queue.cpp
index dc752c9fb2..fdbf1acf88 100644
--- a/cpp/src/qpid/client/Queue.cpp
+++ b/cpp/src/qpid/client/Queue.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/client/Queue.h"
+#include <qpid/client/Queue.h>
 
 qpid::client::Queue::Queue() : name(""), autodelete(true), exclusive(true){}
 
diff --git a/cpp/src/qpid/client/ResponseHandler.cpp b/cpp/src/qpid/client/ResponseHandler.cpp
index 5d2e03c9d9..2e097741fa 100644
--- a/cpp/src/qpid/client/ResponseHandler.cpp
+++ b/cpp/src/qpid/client/ResponseHandler.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "qpid/client/ResponseHandler.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/QpidError.h"
+#include <qpid/client/ResponseHandler.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/QpidError.h>
 
 using namespace qpid::sys;
 
diff --git a/cpp/src/qpid/client/ResponseHandler.h b/cpp/src/qpid/client/ResponseHandler.h
index 247c974c14..2559bfb688 100644
--- a/cpp/src/qpid/client/ResponseHandler.h
+++ b/cpp/src/qpid/client/ResponseHandler.h
@@ -16,7 +16,7 @@
  *
  */
 #include <string>
-#include "qpid/framing/amqp_framing.h"
+#include <qpid/framing/amqp_framing.h>
 #include <qpid/sys/Monitor.h>
 
 #ifndef _ResponseHandler_
diff --git a/cpp/src/qpid/client/ReturnedMessageHandler.cpp b/cpp/src/qpid/client/ReturnedMessageHandler.cpp
index ca6fba2408..7dba78512d 100644
--- a/cpp/src/qpid/client/ReturnedMessageHandler.cpp
+++ b/cpp/src/qpid/client/ReturnedMessageHandler.cpp
@@ -16,6 +16,6 @@
  *
  */
 
-#include "qpid/client/ReturnedMessageHandler.h"
+#include <qpid/client/ReturnedMessageHandler.h>
 
 qpid::client::ReturnedMessageHandler::~ReturnedMessageHandler() {}
diff --git a/cpp/src/qpid/client/ReturnedMessageHandler.h b/cpp/src/qpid/client/ReturnedMessageHandler.h
index 5a4c4d5d1b..115f29bc15 100644
--- a/cpp/src/qpid/client/ReturnedMessageHandler.h
+++ b/cpp/src/qpid/client/ReturnedMessageHandler.h
@@ -20,7 +20,7 @@
 #ifndef _ReturnedMessageHandler_
 #define _ReturnedMessageHandler_
 
-#include "qpid/client/Message.h"
+#include <qpid/client/Message.h>
 
 namespace qpid {
 namespace client {