amiro-os / kernel / patches / BaseStaticThread-diamond-problem-fix.patch @ 5b0a8e7b
History | View | Annotate | Download (823 Bytes)
| 1 |
From 94da217d87dd5994e8ac096a121241dafd7b41e6 Mon Sep 17 00:00:00 2001
|
|---|---|
| 2 |
From: =?UTF-8?q?Thomas=20Sch=C3=B6pping?= <tschoepp@cit-ec.uni-bielefeld.de>
|
| 3 |
Date: Tue, 13 Jun 2017 11:04:04 +0200
|
| 4 |
Subject: [PATCH] BaseStaticThread diamond problem fix
|
| 5 |
|
| 6 |
---
|
| 7 |
os/various/cpp_wrappers/ch.hpp | 2 +- |
| 8 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 9 |
|
| 10 |
diff --git a/os/various/cpp_wrappers/ch.hpp b/os/various/cpp_wrappers/ch.hpp
|
| 11 |
index ec86566..4eb7b2e 100644
|
| 12 |
--- a/os/various/cpp_wrappers/ch.hpp
|
| 13 |
+++ b/os/various/cpp_wrappers/ch.hpp
|
| 14 |
@@ -877,7 +877,7 @@ namespace chibios_rt { |
| 15 |
* @param N the working area size for the thread class |
| 16 |
*/ |
| 17 |
template <int N> |
| 18 |
- class BaseStaticThread : public BaseThread {
|
| 19 |
+ class BaseStaticThread : public virtual BaseThread {
|
| 20 |
protected:
|
| 21 |
THD_WORKING_AREA(wa, N); |
| 22 |
|
| 23 |
--
|
| 24 |
2.7.4
|
| 25 |
|