[deprecated code 3] remove MasterLock

fnrizzi · Oct 18, 2023 · 7c63c32 · 7c63c32
1 parent fb0bd52
commit 7c63c32
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 85 deletions.
diff --git a/core/src/Kokkos_Core_fwd.hpp b/core/src/Kokkos_Core_fwd.hpp
@@ -30,10 +30,6 @@
 #include <impl/Kokkos_Error.hpp>
 #include <impl/Kokkos_Utilities.hpp>
 
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE_3
-#include <Kokkos_MasterLock.hpp>
-#endif
-
 //----------------------------------------------------------------------------
 // Have assumed a 64-bit build (8-byte pointers) throughout the code base.
 // 32-bit build allowed but unsupported.

diff --git a/core/src/Kokkos_MasterLock.hpp b/core/src/Kokkos_MasterLock.hpp
diff --git a/core/src/OpenMP/Kokkos_OpenMP_Instance.hpp b/core/src/OpenMP/Kokkos_OpenMP_Instance.hpp
@@ -119,31 +119,6 @@ class OpenMPInternal {
 
 }  // namespace Impl
 
-namespace Experimental {
-
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE_3
-template <>
-class MasterLock<OpenMP> {
- public:
-  void lock() { omp_set_lock(&m_lock); }
-  void unlock() { omp_unset_lock(&m_lock); }
-  bool try_lock() { return static_cast<bool>(omp_test_lock(&m_lock)); }
-
-  KOKKOS_DEPRECATED MasterLock() { omp_init_lock(&m_lock); }
-  ~MasterLock() { omp_destroy_lock(&m_lock); }
-
-  MasterLock(MasterLock const&) = delete;
-  MasterLock(MasterLock&&)      = delete;
-  MasterLock& operator=(MasterLock const&) = delete;
-  MasterLock& operator=(MasterLock&&) = delete;
-
- private:
-  omp_lock_t m_lock;
-};
-#endif
-
-}  // namespace Experimental
-
 namespace Experimental {
 namespace Impl {
 // Partitioning an Execution Space: expects space and integer arguments for