From c05bff0624d853be52c7ff6d65209c776f8b504e Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 11 May 2017 01:13:07 +0200 Subject: [PATCH] Resolv include circular dependencies. Change-Id: I038677d688c64e87ae86dd2af245f87f5c40e317 Signed-off-by: Romain Forlot --- CAN-binder/low-can-binding/can/can-decoder.cpp | 2 +- CAN-binder/low-can-binding/can/can-message-definition.hpp | 2 +- CAN-binder/low-can-binding/can/can-message.hpp | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CAN-binder/low-can-binding/can/can-decoder.cpp b/CAN-binder/low-can-binding/can/can-decoder.cpp index eae4ef25..b0d7bb8a 100644 --- a/CAN-binder/low-can-binding/can/can-decoder.cpp +++ b/CAN-binder/low-can-binding/can/can-decoder.cpp @@ -19,7 +19,7 @@ #include "canutil/read.h" #include "../utils/openxc-utils.hpp" - +#include "can-message-definition.hpp" #include "../binding/low-can-hat.hpp" /// @brief Parse the signal's bitfield from the given data and return the raw diff --git a/CAN-binder/low-can-binding/can/can-message-definition.hpp b/CAN-binder/low-can-binding/can/can-message-definition.hpp index 612ce357..87c48aca 100644 --- a/CAN-binder/low-can-binding/can/can-message-definition.hpp +++ b/CAN-binder/low-can-binding/can/can-message-definition.hpp @@ -28,8 +28,8 @@ #include #include -#include "can-message.hpp" #include "can-signals.hpp" +#include "can-message.hpp" #include "../utils/timer.hpp" class can_message_set_t; diff --git a/CAN-binder/low-can-binding/can/can-message.hpp b/CAN-binder/low-can-binding/can/can-message.hpp index a7c74521..954fdc38 100644 --- a/CAN-binder/low-can-binding/can/can-message.hpp +++ b/CAN-binder/low-can-binding/can/can-message.hpp @@ -23,7 +23,6 @@ #include #include "../utils/timer.hpp" -#include "can-message-set.hpp" #define CAN_MESSAGE_SIZE 8 -- 2.16.6