QPID-4984: WIP - compiles, but not functional. Changed namespaces in project.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/linearstore@1516306 13f79535-47bb-0310-9956-ffa450edef68

Author: Kim van der Riet

qpid/cpp/src/qpid/linearstore/BindingDbt.cpp

@@ -21,8 +21,8 @@
 
 #include "qpid/linearstore/BindingDbt.h"
 
-namespace mrg {
-namespace msgstore {
+namespace qpid {
+namespace linearstore {
 
 BindingDbt::BindingDbt(const qpid::broker::PersistableExchange& e, const qpid::broker::PersistableQueue& q, const std::string& k, const qpid::framing::FieldTable& a)
   : data(new char[encodedSize(e, q, k, a)]),

qpid/cpp/src/qpid/linearstore/BindingDbt.h

@@ -28,8 +28,8 @@
 #include "qpid/framing/Buffer.h"
 #include "qpid/framing/FieldTable.h"
 
-namespace mrg{
-namespace msgstore{
+namespace qpid{
+namespace linearstore{
 
 class BindingDbt : public Dbt
 {

qpid/cpp/src/qpid/linearstore/BufferValue.cpp

@@ -21,8 +21,8 @@
 
 #include "qpid/linearstore/BufferValue.h"
 
-namespace mrg {
-namespace msgstore {
+namespace qpid {
+namespace linearstore {
 
 
 

qpid/cpp/src/qpid/linearstore/BufferValue.h

@@ -26,8 +26,8 @@
 #include "qpid/broker/Persistable.h"
 #include "qpid/framing/Buffer.h"
 
-namespace mrg{
-namespace msgstore{
+namespace qpid{
+namespace linearstore{
 
 class BufferValue : public Dbt
 {

qpid/cpp/src/qpid/linearstore/Cursor.h

@@ -25,8 +25,8 @@
 #include <boost/shared_ptr.hpp>
 #include "db-inc.h"
 
-namespace mrg{
-namespace msgstore{
+namespace qpid{
+namespace linearstore{
 
 class Cursor
 {

qpid/cpp/src/qpid/linearstore/DataTokenImpl.cpp

@@ -21,7 +21,7 @@
 
 #include "qpid/linearstore/DataTokenImpl.h"
 
-using namespace mrg::msgstore;
+using namespace qpid::linearstore;
 
 DataTokenImpl::DataTokenImpl():data_tok() {}
 

qpid/cpp/src/qpid/linearstore/DataTokenImpl.h

@@ -26,10 +26,10 @@
 #include "qpid/broker/PersistableMessage.h"
 #include <boost/intrusive_ptr.hpp>
 
-namespace mrg {
-namespace msgstore {
+namespace qpid{
+namespace linearstore{
 
-class DataTokenImpl : public journal::data_tok, public qpid::RefCounted
+class DataTokenImpl : public qpid::qls_jrnl::data_tok, public qpid::RefCounted
 {
   private:
     boost::intrusive_ptr<qpid::broker::PersistableMessage> sourceMsg;

qpid/cpp/src/qpid/linearstore/IdDbt.cpp

@@ -21,7 +21,7 @@
 
 #include "qpid/linearstore/IdDbt.h"
 
-using namespace mrg::msgstore;
+using namespace qpid::linearstore;
 
 IdDbt::IdDbt() : id(0)
 {

qpid/cpp/src/qpid/linearstore/IdDbt.h

@@ -24,8 +24,8 @@
 
 #include "db-inc.h"
 
-namespace mrg{
-namespace msgstore{
+namespace qpid{
+namespace linearstore{
 
 class IdDbt : public Dbt
 {

qpid/cpp/src/qpid/linearstore/IdSequence.cpp

@@ -21,7 +21,7 @@
 
 #include "qpid/linearstore/IdSequence.h"
 
-using namespace mrg::msgstore;
+using namespace qpid::linearstore;
 using qpid::sys::Mutex;
 
 IdSequence::IdSequence() : id(1) {}