Moved APR specific sources into src_apr.

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

2 files changed, 5 insertions, 5 deletions

diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index 88dad7aaf9..d671cea9a5 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -38,7 +38,7 @@ Queue::Queue(const string& _name, bool _durable, u_int32_t _autodelete,
     lastUsed(0),
     exclusive(0)
 {
-    if(autodelete) lastUsed = apr_time_as_msec(apr_time_now());
+    if(autodelete) lastUsed = Time::now().msecs();
 }
 
 Queue::~Queue(){
@@ -128,7 +128,7 @@ void Queue::consume(Consumer* c, bool requestExclusive){
 void Queue::cancel(Consumer* c){
     Locker locker(lock);
     consumers.erase(find(consumers.begin(), consumers.end(), c));
-    if(autodelete && consumers.empty()) lastUsed = apr_time_as_msec(apr_time_now());
+    if(autodelete && consumers.empty()) lastUsed = Time::now().msecs();
     if(exclusive == c) exclusive = 0;
 }
 
@@ -161,7 +161,7 @@ u_int32_t Queue::getConsumerCount() const{
 
 bool Queue::canAutoDelete() const{
     Locker locker(lock);
-    return lastUsed && ((apr_time_as_msec(apr_time_now()) - lastUsed) > autodelete);
+    return lastUsed && (Time::now().msecs() - lastUsed > autodelete);
 }
 
 void Queue::enqueue(Message::shared_ptr& msg, const string * const xid){
diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h
index f954e48c20..edc7c99b4f 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -21,13 +21,13 @@
 #include <vector>
 #include <queue>
 #include <boost/shared_ptr.hpp>
-#include "apr-1/apr_time.h"
 #include "qpid/framing/amqp_types.h"
 #include "qpid/broker/Binding.h"
 #include "qpid/broker/ConnectionToken.h"
 #include "qpid/broker/Consumer.h"
 #include "qpid/broker/Message.h"
 #include "qpid/concurrent/Monitor.h"
+#include "qpid/concurrent/Time.h"
 
 namespace qpid {
     namespace broker {
@@ -57,7 +57,7 @@ namespace qpid {
             bool dispatching;
             int next;
             mutable qpid::concurrent::Monitor lock;
-            apr_time_t lastUsed;
+            int64_t lastUsed;
             Consumer* exclusive;
 
             bool startDispatching();