git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7856 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 5 insertions, 6 deletions

diff --git a/os/various/cpp_wrappers/ch.cpp b/os/various/cpp_wrappers/ch.cpp
index 2e3d05937..33138807d 100644
--- a/os/various/cpp_wrappers/ch.cpp
+++ b/os/various/cpp_wrappers/ch.cpp
@@ -248,9 +248,8 @@ namespace chibios_rt {
 

   }

 

-  msg_t BaseThread::main(void) {

+  void BaseThread::main(void) {

 

-    return 0;

   }

 

   ThreadReference BaseThread::start(tprio_t prio) {

@@ -260,9 +259,9 @@ namespace chibios_rt {
     return *this;

   };

 

-  msg_t _thd_start(void *arg) {

+  void _thd_start(void *arg) {

 

-    return ((BaseThread *)arg)->main();

+    ((BaseThread *)arg)->main();

   }

 

   void BaseThread::setName(const char *tname) {

diff --git a/os/various/cpp_wrappers/ch.hpp b/os/various/cpp_wrappers/ch.hpp
index e50aa6df6..9f3c5ec1f 100644
--- a/os/various/cpp_wrappers/ch.hpp
+++ b/os/various/cpp_wrappers/ch.hpp
@@ -440,7 +440,7 @@ namespace chibios_rt {
      *

      * @api

      */

-    virtual msg_t main(void);

+    virtual void main(void);

 

     /**

      * @brief   Creates and starts a system thread.

@@ -787,7 +787,7 @@ namespace chibios_rt {
      * @api

      */

     virtual ThreadReference start(tprio_t prio) {

-      msg_t _thd_start(void *arg);

+      void _thd_start(void *arg);

 

       thread_ref = chThdCreateStatic(wa, sizeof(wa), prio, _thd_start, this);

       return *this;