diff options
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Broker.cpp | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp index 7741d83665..7367336aff 100644 --- a/qpid/cpp/src/qpid/broker/Broker.cpp +++ b/qpid/cpp/src/qpid/broker/Broker.cpp @@ -217,7 +217,9 @@ Broker::Broker(const Broker::Options& conf) : store(new NullMessageStore), acl(0), dataDir(conf.noDataDir ? std::string() : conf.dataDir), - pagingDir(!conf.pagingDir.empty() ? conf.pagingDir : !conf.noDataDir ? dataDir.getPath() + Options::DEFAULT_PAGED_QUEUE_DIR : std::string() ), + pagingDir(!conf.pagingDir.empty() ? conf.pagingDir : + dataDir.isEnabled() ? dataDir.getPath() + Options::DEFAULT_PAGED_QUEUE_DIR : + std::string() ), queues(this), exchanges(this), links(this), diff --git a/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp b/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp index 9bb3fa2320..60b3df7da6 100644 --- a/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp +++ b/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp @@ -27,11 +27,10 @@ class MemoryMappedFilePrivate {}; MemoryMappedFile::MemoryMappedFile() : state(0) {} MemoryMappedFile::~MemoryMappedFile() {} -std::string MemoryMappedFile::open(const std::string& /*name*/, const std::string& /*directory*/) +void MemoryMappedFile::open(const std::string& /*name*/, const std::string& /*directory*/) { - return std::string(); } -void MemoryMappedFile::close(const std::string& /*path*/) +void MemoryMappedFile::close() { } size_t MemoryMappedFile::getPageSize() |