From ce312a375001d3823343ed26b173a7035fb90b17 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 4 Mar 2022 14:29:47 +1100 Subject: [PATCH] AP_Scripting: stop libraries including AP_Logger.h in .h files AP_Logger.h is a nexus of includes; while this is being improved over time, there's no reason for the library headers to include AP_Logger.h as the logger itself is access by singleton and the structures are in LogStructure.h This necessitated moving The PID_Info structure out of AP_Logger's namespace. This cleans up a pretty nasty bit - that structure is definitely not simply used for logging, but also used to pass pid information around to controllers! There are a lot of patches in here because AP_Logger.h, acting as a nexus, was providing transitive header file inclusion in many (some unlikely!) places. --- libraries/AP_Scripting/lua_repl.cpp | 2 ++ libraries/AP_Scripting/lua_scripts.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/libraries/AP_Scripting/lua_repl.cpp b/libraries/AP_Scripting/lua_repl.cpp index b5d775431d..373276ca10 100644 --- a/libraries/AP_Scripting/lua_repl.cpp +++ b/libraries/AP_Scripting/lua_repl.cpp @@ -10,6 +10,8 @@ #include "lua/src/lauxlib.h" #include "lua/src/lualib.h" +#include + #if !defined(LUA_MAXINPUT) #define LUA_MAXINPUT 256 #endif diff --git a/libraries/AP_Scripting/lua_scripts.cpp b/libraries/AP_Scripting/lua_scripts.cpp index 389429a36a..ea5d92d411 100644 --- a/libraries/AP_Scripting/lua_scripts.cpp +++ b/libraries/AP_Scripting/lua_scripts.cpp @@ -16,6 +16,7 @@ #include "lua_scripts.h" #include #include "AP_Scripting.h" +#include #include