MSVC 7.1 fix

diff --git a/src/Main/fg_os_osgviewer.cxx b/src/Main/fg_os_osgviewer.cxx
index ee7367ef02d19fe69ad453d523556bbf8032286f..bfee9f57ba8c10d66b65c250728ba56380d14803 100644 (file)
--- a/src/Main/fg_os_osgviewer.cxx
+++ b/src/Main/fg_os_osgviewer.cxx
@@ -1,4 +1,4 @@
-// fg_os_common.cxx -- common functions for fg_os interface
+// fg_os_osgviewer.cxx -- common functions for fg_os interface
 // implemented as an osgViewer
 //
 // Copyright (C) 2007  Tim Moore timoore@redhat.com
@@ -18,6 +18,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <algorithm>
 #include <iostream>
 #include <sstream>
@@ -81,13 +85,13 @@ CameraGroup* buildDefaultCameraGroup(osgViewer::Viewer* viewer,
     CameraGroup* cgroup = CameraGroup::buildCameraGroup(viewer, gnode);
     // Look for a camera with no shear
     Camera* masterCamera = 0;
-    for (CameraGroup::CameraIterator iter = cgroup->camerasBegin(),
+    for (CameraGroup::CameraIterator citer = cgroup->camerasBegin(),
              e = cgroup->camerasEnd();
-         iter != e;
-         ++iter) {
-        const View::Slave& slave = viewer->getSlave((*iter)->slaveIndex);
+         citer != e;
+         ++citer) {
+        const View::Slave& slave = viewer->getSlave((*citer)->slaveIndex);
         if (slave._projectionOffset.isIdentity()) {
-            masterCamera = (*iter)->camera.get();
+            masterCamera = (*citer)->camera.get();
             break;
         }
     }