fix compile errors

Author: AlexanderViand

p-isa_tools/functional_modeler/data_handlers/json_data_handler.h

@@ -297,7 +297,7 @@ std::vector<std::pair<std::string, std::vector<T>>> JSONDataHandler<T>::getAllim
         }
         auto metadata = m_input_json["metadata"];
         auto inputs   = metadata.find("immediate");
-        if (inputs != metadata.end() && !inputs->empty())
+        if (!inputs.operator==(metadata.end()) && !inputs->empty())
         {
             for (const auto &input : inputs->items())
             {

p-isa_tools/program_mapper/p_isa/pisa_test_generator.h

@@ -3,14 +3,15 @@
 
 #pragma once
 
-#include "program_mapper/p_isa/tests/pisa_instruction_tests.h"
-#include "program_mapper/p_isa/tests/pisa_kernel_tests.h"
-#include <common/graph/graph.h>
-#include <common/p_isa/p_isa.h>
 #include <nlohmann/json.hpp>
-#include <program_mapper/poly_program/polyprogram.h>
 #include <vector>
 
+#include "common/graph/graph.h"
+#include "common/p_isa/p_isa.h"
+#include "program_mapper/p_isa/tests/pisa_instruction_tests.h"
+#include "program_mapper/p_isa/tests/pisa_kernel_tests.h"
+#include "program_mapper/poly_program/polyprogram.h"
+
 using json = nlohmann::json;
 namespace pisa::testgenerator {