Updates to go along with changes in fgstream.

diff --git a/FixNode/fixnode.cxx b/FixNode/fixnode.cxx
index 183833d4d6b45b047abd11d2370fc6b5b9fdfc14..5269ac4596bdf35c657f398e1a1f4cfa1667adf3 100644 (file)
--- a/FixNode/fixnode.cxx
+++ b/FixNode/fixnode.cxx
@@ -60,16 +60,16 @@ void load_nodes(const string& filename, container& node_list) {
     }
 
     // Read header line
-    in.stream() >> nodecount >> dim >> junk1 >> junk2;
+    in >> nodecount >> dim >> junk1 >> junk2;
     cout << "    Expecting " << nodecount << " nodes\n";
 
     // start with an empty list :-)
     node_list.erase( node_list.begin(), node_list.end() );
 
-    in.eat_comments();
+    in >> skipcomment;
     while ( ! in.eof() ) {
-       in.stream() >> junk1 >> node >> junk2;
-       in.eat_comments();
+       in >> junk1 >> node >> junk2;
+       in >> skipcomment;
        node_list.push_back(node);
     }
 }
@@ -121,6 +121,9 @@ void fix_nodes( const string& filename, fgDEM& dem, container& node_list )
 
 
 // $Log$
+// Revision 1.7  1998/11/06 21:33:55  curt
+// Updates to go along with changes in fgstream.
+//
 // Revision 1.6  1998/10/20 15:49:22  curt
 // Converted to Point3D class.
 //

diff --git a/SplitTris/splittris.cxx b/SplitTris/splittris.cxx
index e4247715e46869c487d2f8817d16d87d75ed3b5b..20e26e7a9dcf3a0dfa6d04d0f7da5c97f1bab3fb 100644 (file)
--- a/SplitTris/splittris.cxx
+++ b/SplitTris/splittris.cxx
@@ -156,11 +156,11 @@ void triload(const string& basename) {
     nodes_cart.push_back(node1);
     tri_list.push_back(tri);
 
-    node_in.stream() >> nodecount >> dim >> junk1 >> junk2;
+    node_in >> nodecount >> dim >> junk1 >> junk2;
     cout << "    Expecting " << nodecount << " nodes\n";
 
     for ( i = 1; i <= nodecount; i++ ) {
-       node_in.stream() >> junk1 >> node1 >> junk2;
+       node_in >> junk1 >> node1 >> junk2;
        nodes_orig.push_back(node1);
        // printf("%d %.2f %.2f %.2f\n", junk1, node1.x, node1.y, node1.z);
        
@@ -199,13 +199,13 @@ void triload(const string& basename) {
        exit(-1);
     }
 
-    ele_in.stream() >> tricount >> junk1 >> junk2;
+    ele_in >> tricount >> junk1 >> junk2;
     cout << "    Expecting " << tricount << " elements\n";
 
     for ( i = 1; i <= tricount; i++ ) {
        // fscanf(ele_file, "%d %d %d %d\n", &junk1, 
        //        &(tri.n1), &(tri.n2), &(tri.n3));
-       ele_in.stream() >> junk1 >> tri.n1 >> tri.n2 >> tri.n3;
+       ele_in >> junk1 >> tri.n1 >> tri.n2 >> tri.n3;
        // printf("%d %d %d %d\n", junk1, tri.n1, tri.n2, tri.n3);
        tri_list.push_back(tri);
     }
@@ -616,6 +616,9 @@ int main(int argc, char **argv) {
 
 
 // $Log$
+// Revision 1.7  1998/11/06 21:33:57  curt
+// Updates to go along with changes in fgstream.
+//
 // Revision 1.6  1998/10/21 14:56:20  curt
 // Fixed a units conversion bug.
 //