From c3b88d24ac082a9c7f103db91da4a97e87250ffd Mon Sep 17 00:00:00 2001 From: Ian Roddis Date: Mon, 9 Aug 2021 11:15:04 -0300 Subject: [PATCH] - Rebasing on master. - Fixes so all tests pass. --- daggy/include/daggy/Defines.hpp | 3 ++- daggy/include/daggy/Serialization.hpp | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daggy/include/daggy/Defines.hpp b/daggy/include/daggy/Defines.hpp index cf7998b..b180aef 100644 --- a/daggy/include/daggy/Defines.hpp +++ b/daggy/include/daggy/Defines.hpp @@ -1,9 +1,10 @@ #pragma once +#include #include -#include #include #include +#include namespace daggy { // Commands and parameters diff --git a/daggy/include/daggy/Serialization.hpp b/daggy/include/daggy/Serialization.hpp index 3eceb63..65b8843 100644 --- a/daggy/include/daggy/Serialization.hpp +++ b/daggy/include/daggy/Serialization.hpp @@ -7,8 +7,7 @@ #include -#include "Logger.hpp" -#include "TaskExecutor.hpp" +#include "Defines.hpp" #include "Task.hpp" namespace rj = rapidjson;