You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2014/01/31 16:51:15 UTC
svn commit: r1563152 - in /qpid/trunk/qpid/cpp/src/qpid: broker/Broker.cpp
sys/windows/MemoryMappedFile.cpp
Author: astitcher
Date: Fri Jan 31 15:51:15 2014
New Revision: 1563152
URL: http://svn.apache.org/r1563152
Log:
QPID-5485: Fixes to broken original checkin
- Fix signatures of dummy windows memory mapped file implementation
- Fix detecting no data dir
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1563152&r1=1563151&r2=1563152&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Fri Jan 31 15:51:15 2014
@@ -217,7 +217,9 @@ Broker::Broker(const Broker::Options& co
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),
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp?rev=1563152&r1=1563151&r2=1563152&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp Fri Jan 31 15:51:15 2014
@@ -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()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org