2.8 branch: Enabling VS2010 builds.

include/osg/NodeTrackerCallback

@@ -18,6 +18,8 @@
 #include <osg/NodeCallback>
 #include <osg/observer_ptr>
 
+#include <iterator>
+
 namespace osg
 {
 

include/osgGA/NodeTrackerManipulator

@@ -19,6 +19,8 @@
 #include <osg/Quat>
 #include <osg/observer_ptr>
 
+#include <iterator>
+
 namespace osgGA{
 
 class OSGGA_EXPORT NodeTrackerManipulator : public MatrixManipulator

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();
     }
 
 }

src/osg/GraphicsContext.cpp

@@ -31,6 +31,7 @@
 #include <map>
 #include <sstream>
 #include <algorithm>
+#include <iterator>
 
 using namespace osg;
 

src/osgDB/DatabasePager.cpp

@@ -29,6 +29,7 @@
 #include <algorithm>
 #include <functional>
 #include <set>
+#include <iterator>
 
 #include <stdlib.h>
 #include <string.h>

src/osgShadow/ConvexPolyhedron.cpp

@@ -22,6 +22,7 @@
 #include<cassert>
 #include<deque>
 #include<algorithm>
+#include <iterator>
 
 #include <stdio.h>
 #include <string.h>

src/osgText/String.cpp

@@ -3,6 +3,8 @@
 #include <osg/Notify>
 #include <osg/Math>
 
+#include <iterator>
+
 using namespace osgText;
 
 ////////////////////////////////////////////////////////////////////////

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

src/osgUtil/Optimizer.cpp

@@ -43,6 +43,7 @@
 #include <algorithm>
 #include <numeric>
 #include <sstream>
+#include <iterator>
 
 using namespace osgUtil;
 

src/osgUtil/SceneView.cpp

@@ -27,6 +27,8 @@
 
 #include <osg/GLU>
 
+#include <iterator>
+
 using namespace osg;
 using namespace osgUtil;
 

src/osgUtil/Simplifier.cpp

@@ -21,6 +21,7 @@
 #include <set>
 #include <list>
 #include <algorithm>
+#include <iterator>
 
 using namespace osgUtil;
 

src/osgUtil/TriStripVisitor.cpp

@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <algorithm>
 #include <map>
+#include <iterator>
 
 #include "TriStrip_tri_stripper.h"
 

src/osgViewer/View.cpp

@@ -25,6 +25,8 @@
 #include <osgUtil/Optimizer>
 #include <osgUtil/IntersectionVisitor>
 
+#include <iterator>
+
 using namespace osgViewer;
 
 class CollectedCoordinateSystemNodesVisitor : public osg::NodeVisitor