Merge branch 'main' of https://github.com/ClemensElflein/xbot_framework…

… into main
xtech · Nov 4, 2024 · b21cf9a · b21cf9a
2 parents 19e4a2f + 6dfe8ac
commit b21cf9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/libxbot-service/include/xbot-service/Service.hpp b/libxbot-service/include/xbot-service/Service.hpp
@@ -37,9 +37,8 @@ class Service : public ServiceIo {
    * @param service Pointer to the service to start
    * @return null
    */
-  static void *startProcessingHelper(void *service) {
+  static void startProcessingHelper(void *service) {
     static_cast<Service *>(service)->runProcessing();
-    return nullptr;
   }
 
  protected:

diff --git a/libxbot-service/include/xbot-service/portable/thread.hpp b/libxbot-service/include/xbot-service/portable/thread.hpp
@@ -14,7 +14,7 @@
 namespace xbot::service::thread {
 typedef XBOT_THREAD_TYPEDEF* ThreadPtr;
 
-bool initialize(ThreadPtr thread, void* (*threadfunc)(void*), void* arg,
+bool initialize(ThreadPtr thread, void (*threadfunc)(void*), void* arg,
                 void* stackbuf, size_t buflen);
 void deinitialize(ThreadPtr thread);
 }  // namespace xbot::service::thread