Make RoutineT::getEntry() type safe

src/Reactor/Routine.hpp

@@ -28,7 +28,7 @@ public:
 	virtual const void *getEntry(int index = 0) const = 0;
 };
 
-// RoutineT is a type-safe wrapper around a Routine and its callable entry, returned by FunctionT
+// RoutineT is a type-safe wrapper around a Routine and its function entry, returned by FunctionT
 template<typename FunctionType>
 class RoutineT;
 
@@ -36,6 +36,8 @@ template<typename Return, typename... Arguments>
 class RoutineT<Return(Arguments...)>
 {
 public:
+	using FunctionType = Return (*)(Arguments...);
+
 	RoutineT() = default;
 
 	explicit RoutineT(const std::shared_ptr<Routine> &routine)
@@ -43,30 +45,29 @@ public:
 	{
 		if(routine)
 		{
-			callable = reinterpret_cast<CallableType>(const_cast<void *>(routine->getEntry(0)));
+			function = reinterpret_cast<FunctionType>(const_cast<void *>(routine->getEntry(0)));
 		}
 	}
 
 	operator bool() const
 	{
-		return callable != nullptr;
+		return function != nullptr;
 	}
 
 	template<typename... Args>
 	Return operator()(Args &&... args) const
 	{
-		return callable(std::forward<Args>(args)...);
+		return function(std::forward<Args>(args)...);
 	}
 
-	const void *getEntry() const
+	const FunctionType getEntry() const
 	{
-		return reinterpret_cast<void *>(callable);
+		return function;
 	}
 
 private:
 	std::shared_ptr<Routine> routine;
-	using CallableType = Return (*)(Arguments...);
-	CallableType callable = nullptr;
+	FunctionType function = nullptr;
 };
 
 }  // namespace rr