Fix c99eeed

OpenModelica · Jul 2, 2015 · 28efb3e · 28efb3e
1 parent cb40561
commit 28efb3e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/SimulationRuntime/cpp/Include/FMU/FMUGlobalSettings.h b/SimulationRuntime/cpp/Include/FMU/FMUGlobalSettings.h
@@ -27,10 +27,10 @@ class  FMUGlobalSettings : public IGlobalSettings
     virtual bool getInfoOutput() { return false; }
     virtual void setInfoOutput(bool) {}
     virtual string    getOutputPath() { return "./"; }
-    virtual OutputFormat getOutputFormat(){return EMPTY;}
+    virtual OutputFormat getOutputFormat(){return OM_EMPTY;}
      virtual LogSettings getLogSettings() {return LogSettings();}
     virtual void setLogSettings(LogSettings) {}
-    virtual OutputPointType getOutputPointType() { return ALL; };
+    virtual OutputPointType getOutputPointType() { return OM_ALL; };
     virtual void setOutputPointType(OutputPointType) {};
     virtual void setOutputFormat(OutputFormat) {}
     virtual void setOutputPath(string) {}

diff --git a/SimulationRuntime/cpp/Include/FMU/FMUWrapper.h b/SimulationRuntime/cpp/Include/FMU/FMUWrapper.h
@@ -52,7 +52,7 @@ class FMUWrapper : public IFMUInterface
 
     virtual fmiStatus setDebugLogging  (fmiBoolean loggingOn)
     {
-    	Logger::setEnabled(loggingOn);
+      Logger::setEnabled(loggingOn);
         return fmiOK;
     }
 
@@ -66,11 +66,11 @@ class FMUWrapper : public IFMUInterface
 
     virtual fmiStatus setContinuousStates    (const fmiReal states[], size_t nx)
     {
-    	Logger::write("setContinuousStates called",OTHER,INFO);
+      Logger::write("setContinuousStates called",OM_OTHER,OM_INFO);
       // to set states do the folowing
-	  std::stringstream message;
-	  message << "Setting continuous states";
-	  Logger::write(message.str(),OTHER,INFO);
+    std::stringstream message;
+    message << "Setting continuous states";
+    Logger::write(message.str(),OM_OTHER,OM_INFO);
       _model->setContinuousStates(states);
       _need_update = true;
       return fmiOK;
@@ -144,13 +144,13 @@ class FMUWrapper : public IFMUInterface
       eventInfo.terminateSimulation = fmiFalse;
       eventInfo.upcomingTimeEvent = fmiFalse;
       //eventInfo.nextTimeEvent no need to set this for this model
-      Logger::write("Initialization completed",OTHER,INFO);
+      Logger::write("Initialization completed",OM_OTHER,OM_INFO);
       return fmiOK;
     }
 
     virtual fmiStatus getDerivatives    (fmiReal derivatives[]    , size_t nx)
     {
-	  Logger::write("Try to get derivatives",OTHER,INFO);
+    Logger::write("Try to get derivatives",OM_OTHER,OM_INFO);
       updateModel();
       _model->getRHS(derivatives);
       return fmiOK;

diff --git a/SimulationRuntime/cpp/Include/FMU2/FMU2GlobalSettings.h b/SimulationRuntime/cpp/Include/FMU2/FMU2GlobalSettings.h
@@ -63,10 +63,10 @@ class FMU2GlobalSettings : public IGlobalSettings
   virtual bool            getInfoOutput() { return false; }
   virtual void            setInfoOutput(bool) {}
   virtual string          getOutputPath() { return "./"; }
-  virtual OutputFormat    getOutputFormat() { return EMPTY; }
+  virtual OutputFormat    getOutputFormat() { return OM_EMPTY; }
   virtual LogSettings     getLogSettings() { return LogSettings(); }
   virtual void            setLogSettings(LogSettings) {}
-  virtual OutputPointType getOutputPointType() { return ALL; };
+  virtual OutputPointType getOutputPointType() { return OM_ALL; };
   virtual void            setOutputPointType(OutputPointType) {};
   virtual void            setOutputFormat(OutputFormat) {}
   virtual void            setOutputPath(string) {}

diff --git a/common b/common