summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Freeze/SharedDbEnv.cpp6
-rw-r--r--cpp/src/IceUtil/FileUtil.cpp1
2 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/Freeze/SharedDbEnv.cpp b/cpp/src/Freeze/SharedDbEnv.cpp
index 52f63808b1c..d467e6cae3c 100644
--- a/cpp/src/Freeze/SharedDbEnv.cpp
+++ b/cpp/src/Freeze/SharedDbEnv.cpp
@@ -275,13 +275,15 @@ Freeze::SharedDbEnv::removeSharedMapDb(const string& dbName)
}
-void Freeze::SharedDbEnv::__incRef()
+void
+Freeze::SharedDbEnv::__incRef()
{
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(refCountMutex);
_refCount++;
}
-void Freeze::SharedDbEnv::__decRef()
+void
+Freeze::SharedDbEnv::__decRef()
{
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(refCountMutex);
if(--_refCount == 0)
diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp
index f22fda8b7c3..d89e9e7f6a3 100644
--- a/cpp/src/IceUtil/FileUtil.cpp
+++ b/cpp/src/IceUtil/FileUtil.cpp
@@ -498,6 +498,7 @@ IceUtilInternal::FileLock::FileLock(const std::string& path) :
IceUtilInternal::FileLock::~FileLock()
{
assert(_fd > -1);
+ ::close(_fd);
unlink(_path);
}