More reorg to separate APR/posix code, work in progress.

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

2 files changed, 2 insertions, 5 deletions

diff --git a/cpp/test/unit/qpid/sys/APRBaseTest.cpp b/cpp/test/unit/qpid/apr/APRBaseTest.cpp
index fc0c7dd9e1..a0f88f78db 100644
--- a/cpp/test/unit/qpid/sys/APRBaseTest.cpp
+++ b/cpp/test/unit/qpid/apr/APRBaseTest.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/sys/APRBase.h"
+#include "qpid/apr/APRBase.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/cpp/test/unit/qpid/broker/MessageTest.cpp b/cpp/test/unit/qpid/broker/MessageTest.cpp
index 1dbbeda827..c0b9225483 100644
--- a/cpp/test/unit/qpid/broker/MessageTest.cpp
+++ b/cpp/test/unit/qpid/broker/MessageTest.cpp
@@ -15,14 +15,12 @@
  * limitations under the License.
  *
  */
-#include "qpid/sys/APRBase.h"
-#include "qpid/broker/Message.h"
+#include <qpid/broker/Message.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 
 using namespace qpid::broker;
 using namespace qpid::framing;
-using namespace qpid::sys;
 
 class MessageTest : public CppUnit::TestCase  
 {
@@ -34,7 +32,6 @@ class MessageTest : public CppUnit::TestCase
 
     void testMe() 
     {
-        APRBase::increment();
         const int size(10);
         for(int i = 0; i < size; i++){
             Message::shared_ptr msg = Message::shared_ptr(new Message(0, "A", "B", true, true));