control: Split JSON and YAML based binaries
Effectively split the binary built for JSON based configurations from
YAML based configurations. Since each will have objects of the same
name, this split is necessary in order to keep the functional
differences apart while keeping the same object names since the JSON
based objects that are created will eventually replace the others.
Change-Id: I937606781fbfa5d23607f81c0fd445289f2bd036
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/control/manager.hpp b/control/manager.hpp
index 496b343..bb46a41 100644
--- a/control/manager.hpp
+++ b/control/manager.hpp
@@ -1,7 +1,5 @@
#pragma once
-#include "config.h"
-
#include "types.hpp"
#include "zone.hpp"
@@ -67,7 +65,7 @@
* The fan zones in the system
*/
ZoneMap _zones;
-#ifndef CONTROL_USE_JSON
+
/**
* The fan zone layout for the system.
* This is generated data.
@@ -80,7 +78,6 @@
* to give them a chance to get there.
*/
static const unsigned int _powerOnDelay;
-#endif
};
} // namespace control