options/scoped: use raii

1 files changed, 9 insertions, 7 deletions

diff --git a/options/scoped.hpp b/options/scoped.hpp
index f43e9712..117bbf56 100644
--- a/options/scoped.hpp
+++ b/options/scoped.hpp
@@ -9,6 +9,15 @@
 
 namespace options {
 
+struct OTR_OPTIONS_EXPORT with_tracker_teardown final
+{
+    with_tracker_teardown();
+    ~with_tracker_teardown();
+
+private:
+    bool old_value;
+};
+
 struct OTR_OPTIONS_EXPORT opts
 {
     bundle b;
@@ -16,13 +25,6 @@ struct OTR_OPTIONS_EXPORT opts
     opts& operator=(const opts&) = delete;
     opts(const opts&) = delete;
     virtual ~opts();
-
-    // XXX hack: the flag shouldn't be here as action at distance -sh 20160926
-    static void set_teardown_flag(bool value);
-    static bool is_tracker_teardown();
-private:
-    static std::atomic_bool teardown_flag;
-    static void ensure_thread();
 };
 
 }