[cig-commits] r17139 - cs/spatialdata/trunk/libsrc/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2010-08-27 19:22:24 -0700 (Fri, 27 Aug 2010)
New Revision: 17139

Modified:
   cs/spatialdata/trunk/libsrc/spatialdb/SimpleIO.cc
   cs/spatialdata/trunk/libsrc/spatialdb/TimeHistoryIO.cc
   cs/spatialdata/trunk/libsrc/spatialdb/UniformDB.cc
Log:
Added include of ios header file to avoid some Python/gcc bugs causing macro clashes.

Modified: cs/spatialdata/trunk/libsrc/spatialdb/SimpleIO.cc
===================================================================
--- cs/spatialdata/trunk/libsrc/spatialdb/SimpleIO.cc	2010-08-28 00:37:46 UTC (rev 17138)
+++ cs/spatialdata/trunk/libsrc/spatialdb/SimpleIO.cc	2010-08-28 02:22:24 UTC (rev 17139)
@@ -13,23 +13,24 @@
 //
 // ----------------------------------------------------------------------
 //
-
 #include <portinfo>
 
+#include "SimpleIO.hh" // Implementation of class methods
+
+// Include ios here to avoid some Python/gcc issues
+#include <ios>
+
 #include "SpatialDB.hh" // USES SimpleDB
 #include "SimpleDB.hh" // USES SimpleDB
-
-#include "SimpleIO.hh" // Implementation of class methods
-
-#include <string> // USES std::string
 #include "SimpleDBData.hh" // USES SimpleDBData
 
 #include "spatialdata/geocoords/CoordSys.hh" // USES CoordSys
 #include "spatialdata/units/Parser.hh" // USES Parser
 
+#include <sstream> // USES std::ostringstream
+#include <string> // USES std::string
 #include <vector> // USES std::vector
 #include <stdexcept> // USES std::runtime_error, std::exception
-#include <sstream> // USES std::ostringsgream
 #include <assert.h> // USES assert()
 
 // ----------------------------------------------------------------------

Modified: cs/spatialdata/trunk/libsrc/spatialdb/TimeHistoryIO.cc
===================================================================
--- cs/spatialdata/trunk/libsrc/spatialdb/TimeHistoryIO.cc	2010-08-28 00:37:46 UTC (rev 17138)
+++ cs/spatialdata/trunk/libsrc/spatialdb/TimeHistoryIO.cc	2010-08-28 02:22:24 UTC (rev 17139)
@@ -18,12 +18,15 @@
 
 #include "TimeHistoryIO.hh" // Implementation of class methods
 
+// Include ios here to avoid some Python/gcc issues
+#include <ios>
+
 #include "spatialdata/utils/LineParser.hh" // USES LineParser
 #include "spatialdata/units/Parser.hh" // USES Parser
 
 #include <fstream> // USES std::ifstream, std::ofstream
+
 #include <iomanip> // USES setw(), setiosflags(), resetiosflags()
-
 #include <cassert> // USES assert()
 #include <stdexcept> // USES std::runtime_error
 #include <sstream> // USES std::ostringstream

Modified: cs/spatialdata/trunk/libsrc/spatialdb/UniformDB.cc
===================================================================
--- cs/spatialdata/trunk/libsrc/spatialdb/UniformDB.cc	2010-08-28 00:37:46 UTC (rev 17138)
+++ cs/spatialdata/trunk/libsrc/spatialdb/UniformDB.cc	2010-08-28 02:22:24 UTC (rev 17139)
@@ -16,9 +16,11 @@
 
 #include <portinfo>
 
-#include "SpatialDB.hh" // ISA SpatialDB object
 #include "UniformDB.hh" // Implementation of class methods
 
+// Include ios here to avoid some Python/gcc issues
+#include <ios>
+
 #include "spatialdata/units/Parser.hh" // USES Parser
 
 #include <vector> // USES std::vector