From 4617294722140e3d3a7a4ca7416481574187acbf Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 8 Nov 2002 15:56:49 +0000
Subject: [PATCH] Fixes to build in VS7.0

---
 src/osgPlugins/geo/ReaderWriterGEO.cpp | 14 +++++++-------
 src/osgPlugins/lwo/Lwo2Layer.cpp       |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/osgPlugins/geo/ReaderWriterGEO.cpp b/src/osgPlugins/geo/ReaderWriterGEO.cpp
index 7ea24e428..0cc6fe8ef 100644
--- a/src/osgPlugins/geo/ReaderWriterGEO.cpp
+++ b/src/osgPlugins/geo/ReaderWriterGEO.cpp
@@ -714,12 +714,12 @@ class ReaderWriterGEO : public ReaderWriter
                     break;
                 case DB_DSK_HEADER: // attach to previous
                     curparent= &(*itr);
-                    sorted.push_back(itr);
+                    sorted.push_back(&(*itr));
                     break;
                 case DB_DSK_INTERNAL_VARS: // attach to parent
                 case DB_DSK_LOCAL_VARS:
                 case DB_DSK_EXTERNAL_VARS:
-                    (curparent)->addBehaviourRecord((itr));
+                    (curparent)->addBehaviourRecord(&(*itr));
                     break;
                 case DB_DSK_FLOAT_VAR: // attach to parent
                 case DB_DSK_INT_VAR:
@@ -730,13 +730,13 @@ class ReaderWriterGEO : public ReaderWriter
                 case DB_DSK_FLOAT3_VAR:
                 case DB_DSK_FLOAT4_VAR:
                     // else if ((*itr).isVar():
-                    (curparent)->addBehaviourRecord((itr));
+                    (curparent)->addBehaviourRecord(&(*itr));
                         break;
                 case DB_DSK_TEXTURE: // attach to parent
-                    geotxlist.push_back(itr);
+                    geotxlist.push_back(&(*itr));
                     break;
                 case DB_DSK_MATERIAL: // attach to parent
-                    geomatlist.push_back(itr);
+                    geomatlist.push_back(&(*itr));
                     break;
                 case DB_DSK_VIEW: // not needed for Real Time
                     break;
@@ -795,12 +795,12 @@ class ReaderWriterGEO : public ReaderWriter
                 case DB_DSK_ABS_ACTION:
                 case DB_DSK_IF_THEN_ELSE_ACTION:
                 case DB_DSK_DCS_ACTION:
-                    (curparent->getLastChild())->addBehaviourRecord((itr));
+                    (curparent->getLastChild())->addBehaviourRecord(&(*itr));
                     break;
                 default:
                     if (curparent) {
                         (*itr).setparent(curparent);
-                        curparent->addchild(itr);
+                        curparent->addchild(&(*itr));
                     } 
                     break;
                 }
diff --git a/src/osgPlugins/lwo/Lwo2Layer.cpp b/src/osgPlugins/lwo/Lwo2Layer.cpp
index 9ca651336..d21aabcd9 100644
--- a/src/osgPlugins/lwo/Lwo2Layer.cpp
+++ b/src/osgPlugins/lwo/Lwo2Layer.cpp
@@ -106,7 +106,8 @@ Lwo2Layer::GenerateGeode( Geode& geode, short tags_count, DrawableToTagMapping&
       // selecting polygons for current layer only
       int polygon_index = 0;
       PolygonsList polygons;
-      for (IteratorPolygonsList polygon_iterator = _polygons.begin(); polygon_iterator != _polygons.end(); polygon_iterator++, polygon_index++)
+      IteratorPolygonsList polygon_iterator;
+      for (polygon_iterator = _polygons.begin(); polygon_iterator != _polygons.end(); polygon_iterator++, polygon_index++)
 	{
 	  // *polygon_iterator it's a PolygonsList
 
@@ -135,7 +136,6 @@ Lwo2Layer::GenerateGeode( Geode& geode, short tags_count, DrawableToTagMapping&
 
       // polygons of current layer
       polygon_index = 0;
-      IteratorPolygonsList polygon_iterator;
       for (polygon_iterator = polygons.begin(); polygon_iterator != polygons.end(); polygon_iterator++, polygon_index++)
 	{
 	  if ((*polygon_iterator)[0].point_index != -1)