Avoid 'and' operator in C++ code since MSVC12 does not support it

OpenModelica · May 23, 2017 · f821aa3 · f821aa3
1 parent 16a7626
commit f821aa3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/SimulationRuntime/cpp/Include/FMU/FMUWrapper.h b/SimulationRuntime/cpp/Include/FMU/FMUWrapper.h
@@ -285,7 +285,7 @@ class FMUWrapper : public IFMUInterface
       bool state_vars_reinitialized = _model->handleSystemEvents(events);
       //time events
       eventInfo.nextEventTime = _model->computeNextTimeEvents(_model->getTime());
-      if ((eventInfo.nextEventTime != 0.0) and (eventInfo.nextEventTime != std::numeric_limits<double>::max()))
+      if ((eventInfo.nextEventTime != 0.0) && (eventInfo.nextEventTime != std::numeric_limits<double>::max()))
         eventInfo.upcomingTimeEvent = fmiTrue;
       else
         eventInfo.upcomingTimeEvent = fmiFalse;

diff --git a/SimulationRuntime/cpp/Include/FMU2/FMU2Wrapper.cpp b/SimulationRuntime/cpp/Include/FMU2/FMU2Wrapper.cpp
@@ -449,7 +449,7 @@ fmi2Status FMU2Wrapper::newDiscreteStates(fmi2EventInfo *eventInfo)
   bool state_vars_reinitialized = _model->handleSystemEvents(events);
   //time events
   eventInfo->nextEventTime = _model->computeNextTimeEvents(_model->getTime());
-  if ((eventInfo->nextEventTime != 0.0) and (eventInfo->nextEventTime != std::numeric_limits<double>::max()))
+  if ((eventInfo->nextEventTime != 0.0) && (eventInfo->nextEventTime != std::numeric_limits<double>::max()))
     eventInfo->nextEventTimeDefined = fmi2True;
   else
     eventInfo->nextEventTimeDefined = fmi2False;