diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-06-07 01:28:21 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-06-07 01:28:21 +0200 |
| commit | 89b22975575deba2aee277ea03867238f963c3aa (patch) | |
| tree | 1bb8fc857cebe56241a05c53d01d35ae1d092213 | |
| parent | 81fae31aa6881f6d0630da17d5e174d221c6020c (diff) | |
Fix: c++11 detected and not applied from config
Change-Id: Iedf1f88e142a3f579ada3794b1f0f8813105d880
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | CAN-binder/low-can-binding/binding/low-can-cb.cpp | 2 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/can/can-bus.hpp | 2 | ||||
| -rw-r--r-- | CAN-config-generator/etc/config.cmake | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/CAN-binder/low-can-binding/binding/low-can-cb.cpp b/CAN-binder/low-can-binding/binding/low-can-cb.cpp index 071f107..ce829b9 100644 --- a/CAN-binder/low-can-binding/binding/low-can-cb.cpp +++ b/CAN-binder/low-can-binding/binding/low-can-cb.cpp @@ -208,6 +208,8 @@ static int subscribe_unsubscribe_diagnostic_messages(struct afb_req request, boo } else { + diag_m.cleanup_request( + diag_m.find_recurring_request(*diag_req), true); if(sig->get_supported()) {DEBUG(binder_interface, "%s: %s cancelled due to unsubscribe", __FUNCTION__, sig->get_name().c_str());} else diff --git a/CAN-binder/low-can-binding/can/can-bus.hpp b/CAN-binder/low-can-binding/can/can-bus.hpp index dd67ca8..99d5a30 100644 --- a/CAN-binder/low-can-binding/can/can-bus.hpp +++ b/CAN-binder/low-can-binding/can/can-bus.hpp @@ -29,7 +29,7 @@ #include "can-message.hpp" #include "../utils/config-parser.hpp" #include "../binding/low-can-hat.hpp" -#include "../binding/low-can-subscription.hpp" +#include "../binding/low-can-cb.hpp" // TODO actual max is 32 but dropped to 24 for memory considerations #define MAX_ACCEPTANCE_FILTERS 24 diff --git a/CAN-config-generator/etc/config.cmake b/CAN-config-generator/etc/config.cmake index 1819daa..50cb346 100644 --- a/CAN-config-generator/etc/config.cmake +++ b/CAN-config-generator/etc/config.cmake @@ -43,8 +43,8 @@ add_compile_options(-D_REENTRANT) add_compile_options(-DPB_FIELD_16BIT) # LANG Specific compile flags set for all build types -set(CMAKE_C_FLAGS "") -set(CMAKE_CXX_FLAGS "-std=c++11") +set(CMAKE_C_FLAGS "" CACHE STRING "C compile flags") +set(CMAKE_CXX_FLAGS "-std=c++11" CACHE STRING "C++ compile flags") # Print a helper message when every thing is finished setc(CLOSING_MESSAGE "Test with: ./can-config-generator -m ../tests/basic.json -o configuration-generated.cpp") |