From 3325024067487320abddbf0ffb5a528b1743122a Mon Sep 17 00:00:00 2001 From: Vernon Mauery Date: Tue, 12 Mar 2019 16:49:26 -0700 Subject: move types.hpp to ipmid/types.hpp for export types.hpp is required by utility.hpp, which is exported, so it needs to be exported as well. This moves it to the include/libipmid directory, changes the Makefile to export it, and changes all the files that include it so it can be found in the right place. Change-Id: I30ec365446e4de466c266ec4faa327478460ec05 Signed-off-by: Vernon Mauery --- scripts/inventorysensor.mako.cpp | 2 +- scripts/writechannel.mako.cpp | 2 +- scripts/writeentity.mako.cpp | 2 +- scripts/writesensor.mako.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/inventorysensor.mako.cpp b/scripts/inventorysensor.mako.cpp index 000f758..f1ea8cd 100644 --- a/scripts/inventorysensor.mako.cpp +++ b/scripts/inventorysensor.mako.cpp @@ -3,7 +3,7 @@ // !!! WARNING: This is a GENERATED Code..Please do NOT Edit !!! -#include "types.hpp" +#include using namespace ipmi::sensor; extern const InvObjectIDMap invSensors = { diff --git a/scripts/writechannel.mako.cpp b/scripts/writechannel.mako.cpp index 922611a..83ee5cd 100644 --- a/scripts/writechannel.mako.cpp +++ b/scripts/writechannel.mako.cpp @@ -2,7 +2,7 @@ ## into the rendered file; feel free to edit this file. // !!! WARNING: This is a GENERATED Code..Please do NOT Edit !!! -#include "types.hpp" +#include namespace ipmi { diff --git a/scripts/writeentity.mako.cpp b/scripts/writeentity.mako.cpp index 9de11a0..4cfc82b 100644 --- a/scripts/writeentity.mako.cpp +++ b/scripts/writeentity.mako.cpp @@ -2,7 +2,7 @@ ## into the rendered file; feel free to edit this file. // !!! WARNING: This is a GENERATED Code..Please do NOT Edit !!! -#include "types.hpp" +#include using namespace ipmi::sensor; extern const EntityInfoMap entities = { diff --git a/scripts/writesensor.mako.cpp b/scripts/writesensor.mako.cpp index bbc80e3..559f0f9 100644 --- a/scripts/writesensor.mako.cpp +++ b/scripts/writesensor.mako.cpp @@ -24,9 +24,9 @@ interfaceDict = {} %>\ % endfor -#include "types.hpp" #include "sensordatahandler.hpp" +#include using namespace ipmi::sensor; extern const IdInfoMap sensors = { -- cgit v1.2.1