Adapt Cpp FMI2 to recent changes to make it compile again

Author: rfranke

SimulationRuntime/cpp/Include/FMU2/FMU2GlobalSettings.h

@@ -37,6 +37,10 @@
 
 #include <Core/SimulationSettings/IGlobalSettings.h>
 
+#ifdef OFF
+#undef OFF // avoid name clash with enum LogType
+#endif
+
 class FMU2GlobalSettings : public IGlobalSettings
 {
  public:
@@ -80,4 +84,4 @@ class FMU2GlobalSettings : public IGlobalSettings
   virtual void            setAlarmTime(unsigned int) {}
   virtual unsigned int    getAlarmTime() { return 0; }
 };
-/** @} */ // end of fmu2
+/** @} */ // end of fmu2

SimulationRuntime/cpp/Include/FMU2/FMU2Wrapper.cpp

@@ -46,7 +46,7 @@
 #include <Core/DataExchange/SimData.h>
 
 /*end workarround*/
-#include <System/AlgLoopSolverFactory.h>
+#include <Core/System/AlgLoopSolverFactory.h>
 
 static fmi2String const _logCategoryNames[] = {
   "logEvents",

SimulationRuntime/cpp/Include/FMU2/FMU2Wrapper.h

@@ -46,7 +46,7 @@
 // build MODEL_CLASS from MODEL_IDENTIFIER
 #define FMU2_PASTER(a, b) a ## b
 #define FMU2_CONCAT(a, b) FMU2_PASTER(a, b)
-#define MODEL_CLASS FMU2_CONCAT(MODEL_IDENTIFIER, FMU)
+#define MODEL_CLASS FMU2_CONCAT(MODEL_IDENTIFIER_SHORT, FMU)
 
 // define logger as macro that passes through variadic args
 #define FMU2_LOG(w, status, category, ...) \
@@ -154,4 +154,4 @@ class FMU2Wrapper
   fmi2CallbackFunctions _functions;
   ModelState _state;
 };
-/** @} */ // end of fmu2
+/** @} */ // end of fmu2