From e641ccb51d3e212893658a54fd3f415744cbabc5 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Wed, 9 Sep 1998 20:58:09 +0000
Subject: [PATCH] Tweaks to loop constructs with STL usage.

---
 Scenery/tilemgr.cxx | 13 ++++++-------
 Scenery/tilemgr.hxx |  5 ++++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Scenery/tilemgr.cxx b/Scenery/tilemgr.cxx
index 3cb010d58..40ca1bed7 100644
--- a/Scenery/tilemgr.cxx
+++ b/Scenery/tilemgr.cxx
@@ -484,9 +484,8 @@ double fgTileMgrCurElev( double lon, double lat, fgPoint3d *abs_view_pos ) {
 	current = t->fragment_list.begin();
 	last = t->fragment_list.end();
 
-	while ( current != last ) {
+	for ( ; current != last; ++current ) {
 	    frag_ptr = &(*current);
-	    current++;
 	    /* printf("distance squared = %.2f, bounding radius = %.2f\n", 
 	       point_line_dist_squared( &(frag_ptr->center), 
 	       &abs_view_pos), local_up),
@@ -644,9 +643,8 @@ void fgTileMgrRender( void ) {
 	    current = t->fragment_list.begin();
 	    last = t->fragment_list.end();
 
-	    while ( current != last ) {
+	    for ( ; current != last; ++current ) {
 		frag_ptr = &(*current);
-		current++;
 		
 		if ( frag_ptr->display_list >= 0 ) {
 		    // Fine (fragment based) culling
@@ -714,7 +712,7 @@ void fgTileMgrRender( void ) {
 
     xglPushMatrix();
 
-    while ( mapcurrent != maplast ) {
+    for ( ; mapcurrent != maplast; ++mapcurrent ) {
         // (char *)key = (*mapcurrent).first;
         // (fgMATERIAL)value = (*mapcurrent).second;
 	mtl_ptr = &(*mapcurrent).second;
@@ -761,8 +759,6 @@ void fgTileMgrRender( void ) {
 		last_tile_ptr = frag_ptr->tile_ptr;
 	    }
 	}
-
-        *mapcurrent++;
     }
 
     xglPopMatrix();
@@ -775,6 +771,9 @@ void fgTileMgrRender( void ) {
 
 
 // $Log$
+// Revision 1.34  1998/09/09 20:58:09  curt
+// Tweaks to loop constructs with STL usage.
+//
 // Revision 1.33  1998/09/08 15:05:10  curt
 // Optimization by Norman Vine.
 //
diff --git a/Scenery/tilemgr.hxx b/Scenery/tilemgr.hxx
index e92787451..62efaf414 100644
--- a/Scenery/tilemgr.hxx
+++ b/Scenery/tilemgr.hxx
@@ -55,7 +55,10 @@ void fgTileMgrRender( void );
 
 
 // $Log$
-// Revision 1.3  1998/08/22 14:49:59  curt
+// Revision 1.4  1998/09/09 20:58:11  curt
+// Tweaks to loop constructs with STL usage.
+//
+// Revision 1.3  1998/08/22  14:49:59  curt
 // Attempting to iron out seg faults and crashes.
 // Did some shuffling to fix a initialization order problem between view
 // position, scenery elevation.
-- 
2.39.2