- Some fixes for min/max defines and namespaces on older systems

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14630 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 3, 2013 · 3e7dbe7 · 3e7dbe7
1 parent a115e7e
commit 3e7dbe7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/SimulationRuntime/c/simulation/simulation_input_xml.cpp b/SimulationRuntime/c/simulation/simulation_input_xml.cpp
@@ -49,9 +49,12 @@
 #include <iomanip>
 #include <map>
 #include <list>
+#include <string>
 #include <string.h>
 #include <expat.h>
 
+using namespace std;
+
 typedef std::map<std::string, std::string> omc_ModelDescription;
 typedef std::map<std::string, std::string> omc_DefaultExperiment;
 typedef std::map<std::string, std::string> omc_ScalarVariable;

diff --git a/SimulationRuntime/c/simulation/simulation_runtime.cpp b/SimulationRuntime/c/simulation/simulation_runtime.cpp
@@ -46,6 +46,9 @@
 #include <cstring>
 #include <cassert>
 #include <signal.h>
+#include <fstream>
+#include <string>
+
 #ifndef _MSC_VER
 #include <regex.h>
 #endif

diff --git a/SimulationRuntime/c/simulation/simulation_runtime.h b/SimulationRuntime/c/simulation/simulation_runtime.h
@@ -51,22 +51,15 @@
 #include "linearize.h"
 #include "simulation_result.h"
 
-#include <fstream>
-#include <iostream>
-#include <string>
-
-using namespace std;
-
-
-extern "C" {
-
-extern simulation_result *sim_result;
-
 #ifndef NO_INTERACTIVE_DEPENDENCY
 #include "../../../interactive/socket.h"
 extern Socket sim_communication_port;
 #endif
 
+extern "C" {
+
+extern simulation_result *sim_result;
+
 #endif /* cplusplus */
 
 /* C-Interface for sim_result->emit(); */