diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2014-01-31 15:51:15 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2014-01-31 15:51:15 +0000 |
| commit | f7e49d4b3d51aa3b9c1e57032f1ade212552dbac (patch) | |
| tree | 44b4239955a425655ea9f6bde377b4f58e749af5 /qpid/cpp/src | |
| parent | 60057de2529d0aab0f5492be5a60f8ae87258e3f (diff) | |
| download | qpid-python-f7e49d4b3d51aa3b9c1e57032f1ade212552dbac.tar.gz | |
QPID-5485: Fixes to broken original checkin
- Fix signatures of dummy windows memory mapped file implementation
- Fix detecting no data dir
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1563152 13f79535-47bb-0310-9956-ffa450edef68
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() |