Update Makefile.conf and Libraries

2020-05-04 22:01:48 +02:00
parent dd7ae1cb73
commit 2d9621f1f1
12 changed files with 23 additions and 49 deletions
@@ -1,6 +1,6 @@
 #include "Device.h"
 #include "Functions.h"
-#include "Util/JSON.h"
+#include <json.hpp>
 #include <Logging.h>
 #include <algorithm>
 #include <sstream>
@@ -87,7 +87,7 @@ void Device::UpdateDevicesFromInventory()
 	try
 	{
 		std::string devices = m_httpClient.GetUrlContents(m_inventoryURL);
-		Util::JSON json = Util::JSON::parse(devices);
+		nlohmann::json json = nlohmann::json::parse(devices);

 		m_dynamicDevices.clear();
 		for (auto& element : json)