Changeset 10764

Timestamp:

11/17/09 15:06:07 (4 years ago)

Author:

robert

Message:

<iterator>, <stdlib.h> and <ctype.h> includes required for QNX compiler

Location:

OpenSceneGraph/trunk

Files:

• include/osg/AudioStream (modified) (1 diff)
• include/osg/NodeTrackerCallback (modified) (1 diff)
• include/osgGA/NodeTrackerManipulator (modified) (1 diff)
• include/osgWidget/Util (modified) (1 diff)
• src/osg/GraphicsContext.cpp (modified) (1 diff)
• src/osg/Notify.cpp (modified) (1 diff)
• src/osgAnimation/StatsHandler.cpp (modified) (2 diffs)
• src/osgDB/DatabasePager.cpp (modified) (1 diff)
• src/osgPlugins/OpenFlight/expPrimaryRecords.cpp (modified) (1 diff)
• src/osgPresentation/PickEventHandler.cpp (modified) (1 diff)
• src/osgShadow/ConvexPolyhedron.cpp (modified) (1 diff)
• src/osgText/String.cpp (modified) (1 diff)
• src/osgUtil/DelaunayTriangulator.cpp (modified) (1 diff)
• src/osgUtil/IncrementalCompileOperation.cpp (modified) (1 diff)
• src/osgUtil/Optimizer.cpp (modified) (1 diff)
• src/osgUtil/SceneView.cpp (modified) (1 diff)
• src/osgUtil/Simplifier.cpp (modified) (1 diff)
• src/osgUtil/TriStripVisitor.cpp (modified) (1 diff)
• src/osgUtil/TriStrip_graph_array.h (modified) (1 diff)
• src/osgUtil/TriStrip_tri_stripper.h (modified) (1 diff)
• src/osgViewer/View.cpp (modified) (1 diff)
• src/osgWidget/Box.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osg/AudioStream

@@ -16 +16 @@
 
 #include <osg/Image>
+#include <stdlib.h>
 
 namespace osg {

OpenSceneGraph/trunk/include/osg/NodeTrackerCallback

@@ -14 +14 @@
 #ifndef OSG_NODETRACKERCALLBACK
 #define OSG_NODETRACKERCALLBACK 1
+
+#include <iterator>
 
 #include <osg/Node>

OpenSceneGraph/trunk/include/osgGA/NodeTrackerManipulator

@@ -19 +19 @@
 #include <osg/Quat>
 #include <osg/observer_ptr>
+
+#include <iterator>
 
 namespace osgGA{

OpenSceneGraph/trunk/include/osgWidget/Util

@@ -17 +17 @@
 #define OSGWIDGET_UTIL
 
+#include <ctype.h>
 #include <cctype>
 #include <algorithm>

OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp

@@ -32 +32 @@
 #include <sstream>
 #include <algorithm>
+#include <iterator>
 
 using namespace osg;

OpenSceneGraph/trunk/src/osg/Notify.cpp

@@ -20 +20 @@
 #include <iostream>
 
+#include <ctype.h>
+
 namespace osg
 {

OpenSceneGraph/trunk/src/osgAnimation/StatsHandler.cpp

@@ -16 +16 @@
 #include <stdio.h>
 #include <math.h>
+#include <stdlib.h>
 
 #include <osg/io_utils>
@@ -441 +442 @@
                     //_actions[name].touch();
                 }
-                                _actions[name]._group->setNodeMask(~osg::Node::NodeMask(0x0));
+                _actions[name]._group->setNodeMask(~osg::Node::NodeMask(0x0));
                 size[name] = 0;
                 pos.y() -= characterSize + graphSpacing;

OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

@@ -30 +30 @@
 #include <functional>
 #include <set>
+#include <iterator>
 
 #include <stdlib.h>

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp

@@ -32 +32 @@
 #include <osgSim/ObjectRecordData>
 
+#include <stdlib.h>
 
 // FIXME: This header was copied verbatim from the importer, with the only change

OpenSceneGraph/trunk/src/osgPresentation/PickEventHandler.cpp

@@ -17 +17 @@
 #include <osg/Notify>
 #include <osgDB/FileUtils>
+
+#include <stdlib.h>
 
 using namespace osgPresentation;

OpenSceneGraph/trunk/src/osgShadow/ConvexPolyhedron.cpp

@@ -23 +23 @@
 #include<deque>
 #include<algorithm>
+#include<iterator>
 
 #include <stdio.h>

OpenSceneGraph/trunk/src/osgText/String.cpp

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

OpenSceneGraph/trunk/src/osgUtil/DelaunayTriangulator.cpp

@@ -25 +25 @@
 #include <map> //GWM July 2005 map is used in constraints.
 #include <osgUtil/Tessellator> // tessellator triangulates the constrained triangles
+#include <stdlib.h>
+#include <iterator>
 
 namespace osgUtil

OpenSceneGraph/trunk/src/osgUtil/IncrementalCompileOperation.cpp

@@ -21 +21 @@
 
 #include <algorithm>
+#include <stdlib.h>
+#include <iterator>
 
 namespace osgUtil 

OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

@@ -45 +45 @@
 #include <numeric>
 #include <sstream>
+
+#include <iterator>
 
 using namespace osgUtil;

OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp

@@ -27 +27 @@
 
 #include <osg/GLU>
+
+#include <iterator>
 
 using namespace osg;

OpenSceneGraph/trunk/src/osgUtil/Simplifier.cpp

@@ -22 +22 @@
 #include <list>
 #include <algorithm>
+
+#include <iterator>
 
 using namespace osgUtil;

OpenSceneGraph/trunk/src/osgUtil/TriStripVisitor.cpp

@@ -21 +21 @@
 #include <algorithm>
 #include <map>
+#include <iterator>
 
 #include "TriStrip_tri_stripper.h"

OpenSceneGraph/trunk/src/osgUtil/TriStrip_graph_array.h

@@ -51 +51 @@
 #define TRISTRIP_GRAPH_ARRAY_H
 
+#include <stdlib.h>
+
 // namespace common_structures
 namespace common_structures {

OpenSceneGraph/trunk/src/osgUtil/TriStrip_tri_stripper.h

@@ -68 +68 @@
 
 #include <vector>
+#include <stdlib.h>
 
 // namespace triangle_stripper

OpenSceneGraph/trunk/src/osgViewer/View.cpp

@@ -26 +26 @@
 #include <osgUtil/ShaderGen>
 #include <osgUtil/IntersectionVisitor>
+
+#include <iterator>
 
 using namespace osgViewer;

OpenSceneGraph/trunk/src/osgWidget/Box.cpp

@@ -1 +1 @@
 // -*-c++-*- osgWidget - Code by: Jeremy Moles (cubicool) 2007-2008
 
+#include <ctype.h>
 #include <osgWidget/Box>