Add some std::decay

gansm · Aug 3, 2023 · cf231ce · cf231ce
1 parent c3bd786
commit cf231ce
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 16 deletions.
diff --git a/final/eventloop/eventloop.cpp b/final/eventloop/eventloop.cpp
@@ -47,12 +47,6 @@ auto EventLoop::run() -> int
   return 0;
 }
 
-//----------------------------------------------------------------------
-void EventLoop::leave()
-{
-  running = false;
-}
-
 
 // private methods of EventLoop
 //----------------------------------------------------------------------

diff --git a/final/eventloop/eventloop.h b/final/eventloop/eventloop.h
@@ -76,6 +76,11 @@ class EventLoop
     friend class Monitor;
 };
 
+// EventLoop inline functions
+//----------------------------------------------------------------------
+inline void EventLoop::leave()
+{ running = false; }
+
 }  // namespace finalcut
 
 #endif  // EVENTLOOP_H
diff --git a/final/eventloop/io_monitor.h b/final/eventloop/io_monitor.h
@@ -64,8 +64,8 @@ class IoMonitor final : public Monitor
 
     // Method
     void init (int, short, handler_t, void*);
-    auto operator=(const IoMonitor&) -> IoMonitor& = delete;
-    auto operator=(const IoMonitor&&) -> IoMonitor& = delete;
+    auto operator = (const IoMonitor&) -> IoMonitor& = delete;
+    auto operator = (const IoMonitor&&) -> IoMonitor& = delete;
 };
 
 }  // namespace finalcut

diff --git a/final/eventloop/posix_timer.cpp b/final/eventloop/posix_timer.cpp
@@ -95,7 +95,7 @@ class SigAlrmHandler
 {
   public:
     // Using-declaration
-    using HandlerReturnType = void (*)(int, siginfo_t*, void*);
+    using HandlerReturnType = std::decay<void(int, siginfo_t*, void*)>::type;
 
     // Overloaded operators
     void operator () (int, siginfo_t* signal_info, void*)

diff --git a/final/eventloop/timer_monitor.h b/final/eventloop/timer_monitor.h
@@ -192,11 +192,6 @@ class TimerMonitor final : public TimerClass::type
     // Disable move constructor
     TimerMonitor (TimerMonitor&&) noexcept = delete;
 
-    // Constructor
-    explicit TimerMonitor (EventLoop* eloop)
-      : TimerClass::type(eloop)
-    { }
-
     // Destructor
     ~TimerMonitor() override;
 

diff --git a/final/output/tty/ftermcap.h b/final/output/tty/ftermcap.h
@@ -39,6 +39,7 @@
 #include <array>
 #include <string>
 #include <thread>
+#include <type_traits>
 #include <utility>
 #include <vector>
 
@@ -76,8 +77,8 @@ class FTermcap final
 
     // Using-declaration
     using TCapMapType = std::array<TCapMap, 85>;
-    using PutCharFunc = int (*)(int);
-    using PutStringFunc = int (*)(const std::string&);
+    using PutCharFunc = std::decay<int(int)>::type;
+    using PutStringFunc = std::decay<int(const std::string&)>::type;
 
     // Constructors
     FTermcap() = default;