Fix void* -> void(*)() casts

telegramdesktop · Dec 27, 2017 · 9e11a5c · 9e11a5c
1 parent 6127f98
commit 9e11a5c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/crl/dispatch/crl_dispatch_async.h b/src/crl/dispatch/crl_dispatch_async.h
@@ -49,9 +49,9 @@ inline void on_queue_invoke(
 		using Plain = Return(*)();
 		const auto copy = static_cast<Plain>(callable);
 		invoker(queue, [](void *passed) {
-			const auto callable = static_cast<Plain>(passed);
+			const auto callable = reinterpret_cast<Plain>(passed);
 			(*callable)();
-		}, static_cast<void*>(copy));
+		}, reinterpret_cast<void*>(copy));
 	} else {
 		const auto copy = new Function(std::forward<Callable>(callable));
 		invoker(queue, [](void *passed) {

diff --git a/src/crl/dispatch/crl_dispatch_queue.h b/src/crl/dispatch/crl_dispatch_queue.h
@@ -44,9 +44,9 @@ class queue {
 			using Plain = Return(*)();
 			const auto copy = static_cast<Plain>(callable);
 			async_plain([](void *passed) {
-				const auto callable = static_cast<Plain>(passed);
+				const auto callable = reinterpret_cast<Plain>(passed);
 				(*callable)();
-			}, static_cast<void*>(copy));
+			}, reinterpret_cast<void*>(copy));
 		} else {
 			const auto copy = new Function(std::forward<Callable>(callable));
 			async_plain([](void *passed) {
@@ -67,9 +67,9 @@ class queue {
 			using Plain = Return(*)();
 			const auto copy = static_cast<Plain>(callable);
 			sync_plain([](void *passed) {
-				const auto callable = static_cast<Plain>(passed);
+				const auto callable = reinterpret_cast<Plain>(passed);
 				(*callable)();
-			}, static_cast<void*>(copy));
+			}, reinterpret_cast<void*>(copy));
 		} else {
 			const auto copy = new Function(std::forward<Callable>(callable));
 			sync_plain([](void *passed) {

diff --git a/src/crl/winapi/crl_winapi_async.h b/src/crl/winapi/crl_winapi_async.h
@@ -46,9 +46,9 @@ inline void async(Callable &&callable) {
 		using Plain = Return(*)();
 		const auto copy = static_cast<Plain>(callable);
 		details::async_plain([](void *passed) {
-			const auto callable = static_cast<Plain>(passed);
+			const auto callable = reinterpret_cast<Plain>(passed);
 			(*callable)();
-		}, static_cast<void*>(copy));
+		}, reinterpret_cast<void*>(copy));
 	} else {
 		const auto copy = new Function(std::forward<Callable>(callable));
 		details::async_plain([](void *passed) {