From 38b454f82483c97a973693a45993e00f0ccb62f1 Mon Sep 17 00:00:00 2001
From: Paul MARTZ <pmartz@skew-matrix.com>
Date: Mon, 28 Mar 2011 02:32:58 +0000
Subject: [PATCH] 2.8 branch: Enabling VS2010 builds.

---
 include/osg/NodeTrackerCallback      |  2 ++
 include/osgGA/NodeTrackerManipulator |  2 ++
 include/osgIntrospection/Value       | 12 ++++++------
 src/osg/GraphicsContext.cpp          |  1 +
 src/osgDB/DatabasePager.cpp          |  1 +
 src/osgShadow/ConvexPolyhedron.cpp   |  1 +
 src/osgText/String.cpp               |  2 ++
 src/osgUtil/DelaunayTriangulator.cpp |  1 +
 src/osgUtil/Optimizer.cpp            |  1 +
 src/osgUtil/SceneView.cpp            |  2 ++
 src/osgUtil/Simplifier.cpp           |  1 +
 src/osgUtil/TriStripVisitor.cpp      |  1 +
 src/osgViewer/View.cpp               |  2 ++
 13 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/include/osg/NodeTrackerCallback b/include/osg/NodeTrackerCallback
index 05c4c21af..b3bc0796e 100644
--- a/include/osg/NodeTrackerCallback
+++ b/include/osg/NodeTrackerCallback
@@ -18,6 +18,8 @@
 #include <osg/NodeCallback>
 #include <osg/observer_ptr>
 
+#include <iterator>
+
 namespace osg
 {
 
diff --git a/include/osgGA/NodeTrackerManipulator b/include/osgGA/NodeTrackerManipulator
index 7694f5d64..1b92f4721 100644
--- a/include/osgGA/NodeTrackerManipulator
+++ b/include/osgGA/NodeTrackerManipulator
@@ -19,6 +19,8 @@
 #include <osg/Quat>
 #include <osg/observer_ptr>
 
+#include <iterator>
+
 namespace osgGA{
 
 class OSGGA_EXPORT NodeTrackerManipulator : public MatrixManipulator
diff --git a/include/osgIntrospection/Value b/include/osgIntrospection/Value
index 25df2b1d7..6afc908d5 100644
--- a/include/osgIntrospection/Value
+++ b/include/osgIntrospection/Value
@@ -224,7 +224,7 @@ namespace osgIntrospection
             // returns the actual pointed type if applicable
             virtual const Type* ptype() const { return 0; }
             // returns whether the data is a null pointer
-            virtual bool nullptr() const = 0;
+            virtual bool isnullptr() const = 0;
 
             Instance_base *inst_;
             Instance_base *_ref_inst;
@@ -237,9 +237,9 @@ namespace osgIntrospection
         {
             Instance_box(): Instance_box_base(), nullptr_(false) {}
 
-            Instance_box(const T &d, bool nullptr = false)
+            Instance_box(const T &d, bool isnullptr = false)
             :    Instance_box_base(),
-                nullptr_(nullptr)
+                nullptr_(isnullptr)
             {
                 Instance<T> *vl = new Instance<T>(d);
                 inst_ = vl;
@@ -267,7 +267,7 @@ namespace osgIntrospection
                 return &typeof(T);
             }
 
-            virtual bool nullptr() const
+            virtual bool isnullptr() const
             {
                 return nullptr_;
             }
@@ -322,7 +322,7 @@ namespace osgIntrospection
                 return &typeofvalue(*static_cast<Instance<T> *>(inst_)->_data);
             }
 
-            virtual bool nullptr() const
+            virtual bool isnullptr() const
             {
                 return static_cast<Instance<T> *>(inst_)->_data == 0;
             }
@@ -428,7 +428,7 @@ namespace osgIntrospection
 
     inline bool Value::isNullPointer() const
     {
-        return _inbox->nullptr();
+        return _inbox->isnullptr();
     }
 
 }
diff --git a/src/osg/GraphicsContext.cpp b/src/osg/GraphicsContext.cpp
index 46e66de3f..563290ef0 100644
--- a/src/osg/GraphicsContext.cpp
+++ b/src/osg/GraphicsContext.cpp
@@ -31,6 +31,7 @@
 #include <map>
 #include <sstream>
 #include <algorithm>
+#include <iterator>
 
 using namespace osg;
 
diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp
index 2fc729873..6e59b1c46 100644
--- a/src/osgDB/DatabasePager.cpp
+++ b/src/osgDB/DatabasePager.cpp
@@ -29,6 +29,7 @@
 #include <algorithm>
 #include <functional>
 #include <set>
+#include <iterator>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/osgShadow/ConvexPolyhedron.cpp b/src/osgShadow/ConvexPolyhedron.cpp
index ecb77d4a0..efece8d9e 100644
--- a/src/osgShadow/ConvexPolyhedron.cpp
+++ b/src/osgShadow/ConvexPolyhedron.cpp
@@ -22,6 +22,7 @@
 #include<cassert>
 #include<deque>
 #include<algorithm>
+#include <iterator>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/osgText/String.cpp b/src/osgText/String.cpp
index 1527db18b..a4d1275fd 100644
--- a/src/osgText/String.cpp
+++ b/src/osgText/String.cpp
@@ -3,6 +3,8 @@
 #include <osg/Notify>
 #include <osg/Math>
 
+#include <iterator>
+
 using namespace osgText;
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/osgUtil/DelaunayTriangulator.cpp b/src/osgUtil/DelaunayTriangulator.cpp
index c8925e154..67b4dea7c 100644
--- a/src/osgUtil/DelaunayTriangulator.cpp
+++ b/src/osgUtil/DelaunayTriangulator.cpp
@@ -23,6 +23,7 @@
 #include <algorithm>
 #include <set>
 #include <map> //GWM July 2005 map is used in constraints.
+#include <iterator>
 #include <osgUtil/Tessellator> // tessellator triangulates the constrained triangles
 
 namespace osgUtil
diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp
index a53b66c92..92f987068 100644
--- a/src/osgUtil/Optimizer.cpp
+++ b/src/osgUtil/Optimizer.cpp
@@ -43,6 +43,7 @@
 #include <algorithm>
 #include <numeric>
 #include <sstream>
+#include <iterator>
 
 using namespace osgUtil;
 
diff --git a/src/osgUtil/SceneView.cpp b/src/osgUtil/SceneView.cpp
index 6c8cfd8d7..ceee73275 100644
--- a/src/osgUtil/SceneView.cpp
+++ b/src/osgUtil/SceneView.cpp
@@ -27,6 +27,8 @@
 
 #include <osg/GLU>
 
+#include <iterator>
+
 using namespace osg;
 using namespace osgUtil;
 
diff --git a/src/osgUtil/Simplifier.cpp b/src/osgUtil/Simplifier.cpp
index 03bdf8a06..c253e68c3 100644
--- a/src/osgUtil/Simplifier.cpp
+++ b/src/osgUtil/Simplifier.cpp
@@ -21,6 +21,7 @@
 #include <set>
 #include <list>
 #include <algorithm>
+#include <iterator>
 
 using namespace osgUtil;
 
diff --git a/src/osgUtil/TriStripVisitor.cpp b/src/osgUtil/TriStripVisitor.cpp
index c077c264d..615a23534 100644
--- a/src/osgUtil/TriStripVisitor.cpp
+++ b/src/osgUtil/TriStripVisitor.cpp
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <algorithm>
 #include <map>
+#include <iterator>
 
 #include "TriStrip_tri_stripper.h"
 
diff --git a/src/osgViewer/View.cpp b/src/osgViewer/View.cpp
index 66bb0ba52..c3c768b96 100644
--- a/src/osgViewer/View.cpp
+++ b/src/osgViewer/View.cpp
@@ -25,6 +25,8 @@
 #include <osgUtil/Optimizer>
 #include <osgUtil/IntersectionVisitor>
 
+#include <iterator>
+
 using namespace osgViewer;
 
 class CollectedCoordinateSystemNodesVisitor : public osg::NodeVisitor