Merge branch 'jsd/atmos' into topic/atmos-merge

[flightgear.git] / src / FDM / UIUCModel / uiuc_2DdataFileReader.h

diff --git a/src/FDM/UIUCModel/uiuc_2DdataFileReader.h b/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
index d32985a6ee28094d2a3af9fdfbfb237d93255fb7..428abc10de7dfed1896f705762961d8081b4cf60 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
+++ b/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
@@ -3,15 +3,19 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRSTREAM
+//#include STL_STRSTREAM
+#include <sstream>
+
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
 
-FG_USING_NAMESPACE(std);
+//using std::istrstream;
 
-int 
-uiuc_2DdataFileReader( string file_name, double convert_x, double convert_y, double convert_z,
-                           double x[100][100], double y[100], double z[100][100], int xmax[100], 
-                           int &ymax);
+void uiuc_2DdataFileReader( string file_name, 
+                            double x[100][100], 
+                            double y[100], 
+                            double z[100][100], 
+                            int xmax[100], 
+                            int &ymax);
 
 #endif // _2D_DATA_FILE_READER_H_