diff options
Diffstat (limited to 'cpp/src/qpid/asyncStore')
47 files changed, 119 insertions, 76 deletions
diff --git a/cpp/src/qpid/asyncStore/AsyncOperation.cpp b/cpp/src/qpid/asyncStore/AsyncOperation.cpp index 1a67a15d6f..1e3ab51165 100644 --- a/cpp/src/qpid/asyncStore/AsyncOperation.cpp +++ b/cpp/src/qpid/asyncStore/AsyncOperation.cpp @@ -21,7 +21,7 @@ * \file AsyncOperation.cpp */ -#include "AsyncOperation.h" +#include "qpid/asyncStore/AsyncOperation.h" #include "qpid/broker/AsyncResultHandle.h" #include "qpid/broker/AsyncResultHandleImpl.h" diff --git a/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp b/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp index 038f4b4238..9c1ff42fa2 100644 --- a/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp +++ b/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp @@ -21,16 +21,15 @@ * \file AsyncStoreImpl.cpp */ -#include "AsyncStoreImpl.h" - -#include "AsyncOperation.h" -#include "ConfigHandleImpl.h" -#include "EnqueueHandleImpl.h" -#include "EventHandleImpl.h" -#include "MessageHandleImpl.h" -#include "QueueHandleImpl.h" -#include "TxnHandleImpl.h" - +#include "qpid/asyncStore/AsyncStoreImpl.h" + +#include "qpid/asyncStore/AsyncOperation.h" +#include "qpid/asyncStore/ConfigHandleImpl.h" +#include "qpid/asyncStore/EnqueueHandleImpl.h" +#include "qpid/asyncStore/EventHandleImpl.h" +#include "qpid/asyncStore/MessageHandleImpl.h" +#include "qpid/asyncStore/QueueHandleImpl.h" +#include "qpid/asyncStore/TxnHandleImpl.h" #include "qpid/broker/ConfigHandle.h" #include "qpid/broker/EnqueueHandle.h" #include "qpid/broker/EventHandle.h" diff --git a/cpp/src/qpid/asyncStore/AsyncStoreImpl.h b/cpp/src/qpid/asyncStore/AsyncStoreImpl.h index 40a7552a68..12a7f62c09 100644 --- a/cpp/src/qpid/asyncStore/AsyncStoreImpl.h +++ b/cpp/src/qpid/asyncStore/AsyncStoreImpl.h @@ -24,11 +24,10 @@ #ifndef qpid_asyncStore_AsyncStoreImpl_h_ #define qpid_asyncStore_AsyncStoreImpl_h_ -#include "AsyncStoreOptions.h" -#include "RunState.h" -#include "OperationQueue.h" - +#include "qpid/asyncStore/AsyncStoreOptions.h" #include "qpid/asyncStore/jrnl2/RecordIdCounter.h" +#include "qpid/asyncStore/RunState.h" +#include "qpid/asyncStore/OperationQueue.h" #include "qpid/broker/AsyncStore.h" namespace qpid { diff --git a/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp b/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp index ea953da0dc..6823ef3a66 100644 --- a/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp +++ b/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp @@ -21,7 +21,7 @@ * \file AsyncStoreOptions.cpp */ -#include "AsyncStoreOptions.h" +#include "qpid/asyncStore/AsyncStoreOptions.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp b/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp index 94984965e0..0dc3ba1f16 100644 --- a/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp +++ b/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp @@ -21,7 +21,7 @@ * \file ConfigHandleImpl.cpp */ -#include "ConfigHandleImpl.h" +#include "qpid/asyncStore/ConfigHandleImpl.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp b/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp index 44ab5da26a..a8e4c938e7 100644 --- a/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp +++ b/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp @@ -21,7 +21,7 @@ * \file EnqueueHandleImpl.cpp */ -#include "EnqueueHandleImpl.h" +#include "qpid/asyncStore/EnqueueHandleImpl.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/EventHandleImpl.cpp b/cpp/src/qpid/asyncStore/EventHandleImpl.cpp index fec98dcfdf..e5f4954114 100644 --- a/cpp/src/qpid/asyncStore/EventHandleImpl.cpp +++ b/cpp/src/qpid/asyncStore/EventHandleImpl.cpp @@ -21,7 +21,7 @@ * \file EventHandleImpl.cpp */ -#include "EventHandleImpl.h" +#include "qpid/asyncStore/EventHandleImpl.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp b/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp index 3ea3333dd1..f8455cbeb2 100644 --- a/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp +++ b/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp @@ -21,7 +21,7 @@ * \file MessageHandleImpl.cpp */ -#include "MessageHandleImpl.h" +#include "qpid/asyncStore/MessageHandleImpl.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/OperationQueue.cpp b/cpp/src/qpid/asyncStore/OperationQueue.cpp index 51dcd7392a..4e05fad10d 100644 --- a/cpp/src/qpid/asyncStore/OperationQueue.cpp +++ b/cpp/src/qpid/asyncStore/OperationQueue.cpp @@ -21,7 +21,7 @@ * \file OperationQueue.cpp */ -#include "OperationQueue.h" +#include "qpid/asyncStore/OperationQueue.h" #include "qpid/broker/AsyncResultHandle.h" #include "qpid/broker/AsyncResultHandleImpl.h" diff --git a/cpp/src/qpid/asyncStore/OperationQueue.h b/cpp/src/qpid/asyncStore/OperationQueue.h index 473b5f1cfb..cbae2554ef 100644 --- a/cpp/src/qpid/asyncStore/OperationQueue.h +++ b/cpp/src/qpid/asyncStore/OperationQueue.h @@ -24,8 +24,7 @@ #ifndef qpid_asyncStore_OperationQueue_h_ #define qpid_asyncStore_OperationQueue_h_ -#include "AsyncOperation.h" - +#include "qpid/asyncStore/AsyncOperation.h" #include "qpid/sys/PollableQueue.h" namespace qpid { diff --git a/cpp/src/qpid/asyncStore/PersistableMessageContext.cpp b/cpp/src/qpid/asyncStore/PersistableMessageContext.cpp index fd449e1b9c..91283329ea 100644 --- a/cpp/src/qpid/asyncStore/PersistableMessageContext.cpp +++ b/cpp/src/qpid/asyncStore/PersistableMessageContext.cpp @@ -1,4 +1,27 @@ -#include "PersistableMessageContext.h" +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * \file PersistableMessageContext.cpp + */ + +#include "qpid/asyncStore/PersistableMessageContext.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/PersistableMessageContext.h b/cpp/src/qpid/asyncStore/PersistableMessageContext.h index ec9eb377c2..d19d390883 100644 --- a/cpp/src/qpid/asyncStore/PersistableMessageContext.h +++ b/cpp/src/qpid/asyncStore/PersistableMessageContext.h @@ -1,3 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * \file PersistableMessageContext.h + */ + #ifndef qpid_asyncStore_PersistableMessageContext_h_ #define qpid_asyncStore_PersistableMessageContext_h_ diff --git a/cpp/src/qpid/asyncStore/Plugin.cpp b/cpp/src/qpid/asyncStore/Plugin.cpp index a577e6c040..f6930272a4 100644 --- a/cpp/src/qpid/asyncStore/Plugin.cpp +++ b/cpp/src/qpid/asyncStore/Plugin.cpp @@ -21,10 +21,9 @@ * \file Plugin.cpp */ -#include "Plugin.h" - -#include "AsyncStoreImpl.h" +#include "qpid/asyncStore/Plugin.h" +#include "qpid/asyncStore/AsyncStoreImpl.h" #include "qpid/broker/Broker.h" namespace qpid { diff --git a/cpp/src/qpid/asyncStore/Plugin.h b/cpp/src/qpid/asyncStore/Plugin.h index 7d2b67bdad..3005a9b57d 100644 --- a/cpp/src/qpid/asyncStore/Plugin.h +++ b/cpp/src/qpid/asyncStore/Plugin.h @@ -24,7 +24,7 @@ #ifndef qpid_broker_Plugin_h_ #define qpid_broker_Plugin_h_ -#include "AsyncStoreOptions.h" +#include "qpid/asyncStore/AsyncStoreOptions.h" #include "qpid/Plugin.h" diff --git a/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp b/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp index ddb10be7b3..74f92bfc51 100644 --- a/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp +++ b/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp @@ -21,7 +21,7 @@ * \file QueueHandleImpl.cpp */ -#include "QueueHandleImpl.h" +#include "qpid/asyncStore/QueueHandleImpl.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/RunState.cpp b/cpp/src/qpid/asyncStore/RunState.cpp index 9ad05655ed..fdf8e5b602 100644 --- a/cpp/src/qpid/asyncStore/RunState.cpp +++ b/cpp/src/qpid/asyncStore/RunState.cpp @@ -21,7 +21,7 @@ * \file RunState.cpp */ -#include "RunState.h" +#include "qpid/asyncStore/RunState.h" #include "qpid/Exception.h" diff --git a/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp b/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp index 8f41d4ce81..2ef7fa58ff 100644 --- a/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp +++ b/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp @@ -21,7 +21,7 @@ * \file TxnHandleImpl.cpp */ -#include "TxnHandleImpl.h" +#include "qpid/asyncStore/TxnHandleImpl.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h b/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h index 0cb1a5ed00..6f22b2fe87 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h +++ b/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h @@ -24,9 +24,9 @@ #ifndef qpid_asyncStore_jrnl2_AsyncJournal_h_ #define qpid_asyncStore_jrnl2_AsyncJournal_h_ -#include "JournalDirectory.h" -#include "JournalRunState.h" -#include "ScopedLock.h" +#include "qpid/asyncStore/jrnl2/JournalDirectory.h" +#include "qpid/asyncStore/jrnl2/JournalRunState.h" +#include "qpid/asyncStore/jrnl2/ScopedLock.h" #include <string> #include <stdint.h> // uint64_t, uint32_t, etc. diff --git a/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h b/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h index 3177b7ea36..55d435c589 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h +++ b/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h @@ -24,7 +24,7 @@ #ifndef qpid_asyncStore_jrnl2_AtomicCounter_h_ #define qpid_asyncStore_jrnl2_AtomicCounter_h_ -#include "ScopedLock.h" +#include "qpid/asyncStore/jrnl2/ScopedLock.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp index 5123077d67..2560149150 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp @@ -21,9 +21,9 @@ * \file DataOpState.cpp */ -#include "DataOpState.h" +#include "qpid/asyncStore/jrnl2/DataOpState.h" -#include "JournalError.h" +#include "qpid/asyncStore/jrnl2/JournalError.h" #include <sstream> // std::ostringstream diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h index 5316c90d69..75ea0b5f77 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h +++ b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h @@ -24,7 +24,7 @@ #ifndef qpid_asyncStore_jrnl2_DataOpState_h_ #define qpid_asyncStore_jrnl2_DataOpState_h_ -#include "State.h" +#include "qpid/asyncStore/jrnl2/State.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp b/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp index c129a1dd37..5ffa7c43f9 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp @@ -21,7 +21,7 @@ * \file DataToken.cpp */ -#include "DataToken.h" +#include "qpid/asyncStore/jrnl2/DataToken.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataToken.h b/cpp/src/qpid/asyncStore/jrnl2/DataToken.h index 3aed38bc42..341286adae 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/DataToken.h +++ b/cpp/src/qpid/asyncStore/jrnl2/DataToken.h @@ -24,9 +24,9 @@ #ifndef qpid_jrnl2_asyncStore_DataToken_h_ #define qpid_jrnl2_asyncStore_DataToken_h_ -#include "DataOpState.h" -#include "DataWrComplState.h" -#include "RecordIdCounter.h" +#include "qpid/asyncStore/jrnl2/DataOpState.h" +#include "qpid/asyncStore/jrnl2/DataWrComplState.h" +#include "qpid/asyncStore/jrnl2/RecordIdCounter.h" #include <string> #include <stdint.h> // uint64_t diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp b/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp index f4d06360bd..70f7e07f8c 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp @@ -21,9 +21,9 @@ * \file DataWrComplState.cpp */ -#include "DataWrComplState.h" +#include "qpid/asyncStore/jrnl2/DataWrComplState.h" -#include "JournalError.h" +#include "qpid/asyncStore/jrnl2/JournalError.h" #include <sstream> // std::ostringstream diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h b/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h index 355180ec87..6123b4f0fe 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h +++ b/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h @@ -24,7 +24,7 @@ #ifndef qpid_asyncStore_jrnl2_DataWrComplState_h_ #define qpid_asyncStore_jrnl2_DataWrComplState_h_ -#include "State.h" +#include "qpid/asyncStore/jrnl2/State.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp index 402f48c24e..b7fb4fa074 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp @@ -21,9 +21,9 @@ * \file DequeueHeader.cpp */ -#include "DequeueHeader.h" +#include "qpid/asyncStore/jrnl2/DequeueHeader.h" -#include "RecordTail.h" +#include "qpid/asyncStore/jrnl2/RecordTail.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.h b/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.h index deb23915f7..d6da730e87 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.h +++ b/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.h @@ -54,7 +54,7 @@ #ifndef qpid_asyncStore_jrnl2_DequeueHeader_h_ #define qpid_asyncStore_jrnl2_DequeueHeader_h_ -#include "RecordHeader.h" +#include "qpid/asyncStore/jrnl2/RecordHeader.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp index b2ebe95c43..f825632884 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp @@ -21,7 +21,7 @@ * \file EnqueueHeader.cpp */ -#include "EnqueueHeader.h" +#include "qpid/asyncStore/jrnl2/EnqueueHeader.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.h b/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.h index 4d6dc9cfed..d62f3dcd87 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.h +++ b/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.h @@ -54,7 +54,7 @@ #ifndef qpid_asyncStore_jrnl2_EnqueueHeader_h_ #define qpid_asyncStore_jrnl2_EnqueueHeader_h_ -#include "EventHeader.h" +#include "qpid/asyncStore/jrnl2/EventHeader.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp index 0b9c2e14d4..e3a6c16445 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp @@ -21,9 +21,9 @@ * \file EventHeader.cpp */ -#include "EventHeader.h" +#include "qpid/asyncStore/jrnl2/EventHeader.h" -#include "RecordTail.h" +#include "qpid/asyncStore/jrnl2/RecordTail.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/EventHeader.h b/cpp/src/qpid/asyncStore/jrnl2/EventHeader.h index c4f48c1022..435fc5cbb2 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/EventHeader.h +++ b/cpp/src/qpid/asyncStore/jrnl2/EventHeader.h @@ -54,7 +54,7 @@ #ifndef qpid_asyncStore_jrnl2_EventHeader_h_ #define qpid_asyncStore_jrnl2_EventHeader_h_ -#include "RecordHeader.h" +#include "qpid/asyncStore/jrnl2/RecordHeader.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp index 169e3b4ab4..ed269b8dc9 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp @@ -21,9 +21,9 @@ * \file FileHeader.cpp */ -#include "FileHeader.h" +#include "qpid/asyncStore/jrnl2/FileHeader.h" -#include "JournalError.h" +#include "qpid/asyncStore/jrnl2/JournalError.h" #include <cerrno> #include <cstring> diff --git a/cpp/src/qpid/asyncStore/jrnl2/FileHeader.h b/cpp/src/qpid/asyncStore/jrnl2/FileHeader.h index 2d7a17a90c..4d164fc695 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/FileHeader.h +++ b/cpp/src/qpid/asyncStore/jrnl2/FileHeader.h @@ -54,7 +54,7 @@ #ifndef qpid_asyncStore_jrnl2_FileHeader_h_ #define qpid_asyncStore_jrnl2_FileHeader_h_ -#include "RecordHeader.h" +#include "qpid/asyncStore/jrnl2/RecordHeader.h" struct timespec; diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp b/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp index 98fe84c87d..714543232e 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp @@ -20,9 +20,9 @@ /** * \file JournalDirectory.cpp */ -#include "JournalDirectory.h" +#include "qpid/asyncStore/jrnl2/JournalDirectory.h" -#include "JournalError.h" +#include "qpid/asyncStore/jrnl2/JournalError.h" #include <cstring> #include <dirent.h> diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp b/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp index 24d840ea2b..864072c3d4 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp @@ -21,7 +21,7 @@ * \file JournalError.cpp */ -#include "JournalError.h" +#include "qpid/asyncStore/jrnl2/JournalError.h" #include <iomanip> // std::setfill(), std::setw() #include <sstream> // std::ostringstream diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalError.h b/cpp/src/qpid/asyncStore/jrnl2/JournalError.h index 44e289df43..c3d9834a65 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/JournalError.h +++ b/cpp/src/qpid/asyncStore/jrnl2/JournalError.h @@ -24,7 +24,7 @@ #ifndef qpid_asyncStore_jrnl2_JournalError_hpp_ #define qpid_asyncStore_jrnl2_JournalError_hpp_ -#include "Streamable.h" +#include "qpid/asyncStore/jrnl2/Streamable.h" #include <map> #include <stdexcept> // std::runtime_error diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalParameters.cpp b/cpp/src/qpid/asyncStore/jrnl2/JournalParameters.cpp index 63417582bc..413d68c69c 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/JournalParameters.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/JournalParameters.cpp @@ -21,7 +21,7 @@ * \file JournalParameters.cpp */ -#include "JournalParameters.h" +#include "qpid/asyncStore/jrnl2/JournalParameters.h" #include <sstream> diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp index 4a0d2cfd7f..a371183aeb 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp @@ -21,9 +21,9 @@ * \file JournalRunState.cpp */ -#include "JournalRunState.h" +#include "qpid/asyncStore/jrnl2/JournalRunState.h" -#include "JournalError.h" +#include "qpid/asyncStore/jrnl2/JournalError.h" #include <sstream> diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h index 4f3a64a009..7983b9411e 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h +++ b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h @@ -24,7 +24,7 @@ #ifndef qpid_asyncStore_jrnl2_JournalRunState_h_ #define qpid_asyncStore_jrnl2_JournalRunState_h_ -#include "State.h" +#include "qpid/asyncStore/jrnl2/State.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp index e12a0c96d8..2d4a487791 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp @@ -21,9 +21,9 @@ * \file RecordHeader.cpp */ -#include "RecordHeader.h" +#include "qpid/asyncStore/jrnl2/RecordHeader.h" -#include "Configuration.h" +#include "qpid/asyncStore/jrnl2/Configuration.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/RecordIdCounter.h b/cpp/src/qpid/asyncStore/jrnl2/RecordIdCounter.h index 5fe2c01429..83cfa74242 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/RecordIdCounter.h +++ b/cpp/src/qpid/asyncStore/jrnl2/RecordIdCounter.h @@ -24,7 +24,7 @@ #ifndef qpid_asyncStore_jrnl2_RecordCounter_h_ #define qpid_asyncStore_jrnl2_RecordCounter_h_ -#include "AtomicCounter.h" +#include "qpid/asyncStore/jrnl2/AtomicCounter.h" #include <stdint.h> // uint64_t diff --git a/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp b/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp index 39e8ba5dcf..0342a4f497 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp @@ -22,9 +22,9 @@ */ -#include "RecordTail.h" +#include "qpid/asyncStore/jrnl2/RecordTail.h" -#include "RecordHeader.h" +#include "qpid/asyncStore/jrnl2/RecordHeader.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp b/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp index 90509f1754..b1d73194c6 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp @@ -21,9 +21,9 @@ * \file ScopedLock.cpp */ -#include "ScopedLock.h" +#include "qpid/asyncStore/jrnl2/ScopedLock.h" -#include "JournalError.h" +#include "qpid/asyncStore/jrnl2/JournalError.h" #include <cerrno> // EBUSY #include <cstring> // std::strerror diff --git a/cpp/src/qpid/asyncStore/jrnl2/State.h b/cpp/src/qpid/asyncStore/jrnl2/State.h index 5d7c8d6fe9..01b25511b1 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/State.h +++ b/cpp/src/qpid/asyncStore/jrnl2/State.h @@ -24,7 +24,7 @@ #ifndef qpid_asyncStore_jrnl2_State_h_ #define qpid_asyncStore_jrnl2_State_h_ -#include "Streamable.h" +#include "qpid/asyncStore/jrnl2/Streamable.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp b/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp index a153797c96..0dfdf0a191 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp @@ -21,7 +21,7 @@ * \file Streamable.cpp */ -#include "Streamable.h" +#include "qpid/asyncStore/jrnl2/Streamable.h" #include <sstream> diff --git a/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp index 6becbeea9c..1ab288f0cd 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp +++ b/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp @@ -21,8 +21,9 @@ * \file TransactionHeader.cpp */ -#include "RecordTail.h" -#include "TransactionHeader.h" +#include "qpid/asyncStore/jrnl2/TransactionHeader.h" + +#include "qpid/asyncStore/jrnl2/RecordTail.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.h b/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.h index 9bc0ee9e9b..48131fb066 100644 --- a/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.h +++ b/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.h @@ -54,7 +54,7 @@ #ifndef qpid_asyncStore_jrnl2_TransactionHeader_h_ #define qpid_asyncStore_jrnl2_TransactionHeader_h_ -#include "RecordHeader.h" +#include "qpid/asyncStore/jrnl2/RecordHeader.h" namespace qpid { namespace asyncStore { |