Remove unused scoped_unlock, unlock_guard_try

STEllAR-GROUP · Feb 19, 2018 · 10d48f3 · 10d48f3
1 parent 35bd4d0
commit 10d48f3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 67 deletions.
diff --git a/hpx/lcos/local/channel.hpp b/hpx/lcos/local/channel.hpp
@@ -19,7 +19,7 @@
 #include <hpx/util/atomic_count.hpp>
 #include <hpx/util/iterator_facade.hpp>
 #include <hpx/util/register_locks.hpp>
-#include <hpx/util/scoped_unlock.hpp>
+#include <hpx/util/unlock_guard.hpp>
 #include <hpx/util/unused.hpp>
 
 #include <boost/intrusive_ptr.hpp>
@@ -206,7 +206,7 @@ namespace hpx { namespace lcos { namespace local
                 std::exception_ptr e;
 
                 {
-                    util::scoped_unlock<std::unique_lock<mutex_type> > ul(l);
+                    util::unlock_guard<std::unique_lock<mutex_type>> ul(l);
                     e = HPX_GET_EXCEPTION(
                             hpx::future_cancelled, hpx::lightweight,
                             "hpx::lcos::local::close",
@@ -478,7 +478,7 @@ namespace hpx { namespace lcos { namespace local
                 // canceled at this point
                 std::exception_ptr e;
                 {
-                    util::scoped_unlock<std::unique_lock<mutex_type> > ul(l);
+                    util::unlock_guard<std::unique_lock<mutex_type>> ul(l);
                     e = std::exception_ptr(
                         HPX_GET_EXCEPTION(hpx::future_cancelled,
                             "hpx::lcos::local::close",

diff --git a/hpx/util/scoped_unlock.hpp b/hpx/util/scoped_unlock.hpp
diff --git a/hpx/util/unlock_guard.hpp b/hpx/util/unlock_guard.hpp
@@ -22,7 +22,7 @@ namespace hpx { namespace util
         HPX_NON_COPYABLE(unlock_guard);
 
     public:
-        typedef Mutex mutex_type;
+        using mutex_type = Mutex;
 
         explicit unlock_guard(Mutex& m)
           : m_(m)
@@ -38,30 +38,6 @@ namespace hpx { namespace util
     private:
         Mutex& m_;
     };
-
-    template <typename Mutex>
-    class unlock_guard_try
-    {
-    public:
-        HPX_NON_COPYABLE(unlock_guard_try);
-
-    public:
-        typedef Mutex mutex_type;
-
-        explicit unlock_guard_try(Mutex& m)
-          : m_(m)
-        {
-            m_.unlock();
-        }
-
-        ~unlock_guard_try()
-        {
-            m_.try_lock();
-        }
-
-    private:
-        Mutex& m_;
-    };
 }}
 
 #endif /*HPX_UTIL_UNLOCK_GUARD_HPP*/
diff --git a/src/runtime/naming/name.cpp b/src/runtime/naming/name.cpp
@@ -24,7 +24,7 @@
 #include <hpx/util/assert.hpp>
 #include <hpx/util/bind.hpp>
 #include <hpx/util/logging.hpp>
-#include <hpx/util/scoped_unlock.hpp>
+#include <hpx/util/unlock_guard.hpp>
 
 #include <boost/io/ios_state.hpp>
 
@@ -444,7 +444,7 @@ namespace hpx { namespace naming
 
             std::int64_t result = 0;
             {
-                hpx::util::scoped_unlock<std::unique_lock<gid_type::mutex_type> >
+                hpx::util::unlock_guard<std::unique_lock<gid_type::mutex_type>>
                     ul(l);
                  result = agas::incref(launch::sync, unlocked_gid, added_credit);
             }

diff --git a/src/util/ini.cpp b/src/util/ini.cpp
@@ -27,7 +27,7 @@
 #include <hpx/util/assert.hpp>
 #include <hpx/util/ini.hpp>
 #include <hpx/util/register_locks.hpp>
-#include <hpx/util/scoped_unlock.hpp>
+#include <hpx/util/unlock_guard.hpp>
 #include <hpx/runtime/serialization/serialize.hpp>
 #include <hpx/runtime/serialization/map.hpp>
 
@@ -486,7 +486,7 @@ void section::add_entry (std::unique_lock<mutex_type>& l,
                 std::string value = it->second.first;
                 entry_changed_func f = it->second.second;
 
-                hpx::util::scoped_unlock<std::unique_lock<mutex_type> > ul(l);
+                hpx::util::unlock_guard<std::unique_lock<mutex_type>> ul(l);
                 f(fullkey, value);
             }
         }
@@ -534,7 +534,7 @@ void section::add_entry (std::unique_lock<mutex_type>& l,
                 std::string value = it->second.first;
                 entry_changed_func f = it->second.second;
 
-                hpx::util::scoped_unlock<std::unique_lock<mutex_type> > ul(l);
+                hpx::util::unlock_guard<std::unique_lock<mutex_type>> ul(l);
                 f(fullkey, value);
             }
         }
@@ -551,7 +551,7 @@ void section::add_entry (std::unique_lock<mutex_type>& l,
                 std::string value = p.first->second.first;
                 entry_changed_func f = p.first->second.second;
 
-                hpx::util::scoped_unlock<std::unique_lock<mutex_type> > ul(l);
+                hpx::util::unlock_guard<std::unique_lock<mutex_type>> ul(l);
                 f(key, value);
             }
         }