Make LockGuard methods inline to please MSVC.

CuriosAI · Feb 8, 2021 · 4108420 · 4108420
1 parent f040034
commit 4108420
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 25 deletions.
diff --git a/msvc/VS2019/leela-zero.vcxproj b/msvc/VS2019/leela-zero.vcxproj
@@ -76,7 +76,6 @@
     <ClCompile Include="..\..\src\SGFParser.cpp" />
     <ClCompile Include="..\..\src\SGFTree.cpp" />
     <ClCompile Include="..\..\src\SHA256.cpp" />
-    <ClCompile Include="..\..\src\SharedMutex.cpp" />
     <ClCompile Include="..\..\src\SMP.cpp" />
     <ClCompile Include="..\..\src\TimeControl.cpp" />
     <ClCompile Include="..\..\src\Timing.cpp" />

diff --git a/msvc/VS2019/leela-zero.vcxproj.filters b/msvc/VS2019/leela-zero.vcxproj.filters
@@ -188,9 +188,6 @@
     <ClCompile Include="..\..\src\SHA256.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\SharedMutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

diff --git a/src/SharedMutex.cpp b/src/SharedMutex.cpp
diff --git a/src/SharedMutex.h b/src/SharedMutex.h
@@ -82,4 +82,23 @@ class LockGuard {
     SharedMutex &m_sm;
 };
 
+template<>
+inline LockGuard<lock_t::X_LOCK>::LockGuard(SharedMutex& sm) : m_sm(sm) {
+    m_sm.lock();
+}
+
+template<>
+inline LockGuard<lock_t::X_LOCK>::~LockGuard() {
+    m_sm.unlock();
+}
+
+template<>
+inline LockGuard<lock_t::S_LOCK>::LockGuard(SharedMutex& sm) : m_sm(sm) {
+    m_sm.lock_shared();
+}
+
+template<>
+inline LockGuard<lock_t::S_LOCK>::~LockGuard() {
+    m_sm.unlock_shared();
+}
 #endif