summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/activesync/XMergeSync.cpp2
-rw-r--r--xmerge/source/activesync/XMergeSync.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/xmerge/source/activesync/XMergeSync.cpp b/xmerge/source/activesync/XMergeSync.cpp
index 13c5cdf57f88..3edc4c94a0e7 100644
--- a/xmerge/source/activesync/XMergeSync.cpp
+++ b/xmerge/source/activesync/XMergeSync.cpp
@@ -831,7 +831,7 @@ long CXMergeSyncModule::LockServer(BOOL fLock)
return ::InterlockedDecrement(&m_lLocks);
}
-long CXMergeSyncModule::GetLockCount()
+long CXMergeSyncModule::GetLockCount() const
{
return m_lLocks + m_lObjs;
}
diff --git a/xmerge/source/activesync/XMergeSync.h b/xmerge/source/activesync/XMergeSync.h
index 1afab6629f1d..f50167e1f833 100644
--- a/xmerge/source/activesync/XMergeSync.h
+++ b/xmerge/source/activesync/XMergeSync.h
@@ -20,7 +20,7 @@ protected:
long m_lObjs;
public:
- long GetLockCount();
+ long GetLockCount() const;
long LockServer(BOOL fLock);
HINSTANCE m_hInst;
CXMergeSyncModule();