From 370deba54610bcbbcbfa0af1fa36a70f87ca17b1 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 17 Nov 2009 14:06:07 +0000 Subject: [PATCH] , and includes required for QNX compiler --- include/osg/AudioStream | 1 + include/osg/NodeTrackerCallback | 2 ++ include/osgGA/NodeTrackerManipulator | 2 ++ include/osgWidget/Util | 1 + src/osg/GraphicsContext.cpp | 1 + src/osg/Notify.cpp | 2 ++ src/osgAnimation/StatsHandler.cpp | 3 ++- src/osgDB/DatabasePager.cpp | 1 + src/osgPlugins/OpenFlight/expPrimaryRecords.cpp | 1 + src/osgPresentation/PickEventHandler.cpp | 2 ++ src/osgShadow/ConvexPolyhedron.cpp | 1 + src/osgText/String.cpp | 2 ++ src/osgUtil/DelaunayTriangulator.cpp | 2 ++ src/osgUtil/IncrementalCompileOperation.cpp | 2 ++ src/osgUtil/Optimizer.cpp | 2 ++ src/osgUtil/SceneView.cpp | 2 ++ src/osgUtil/Simplifier.cpp | 2 ++ src/osgUtil/TriStripVisitor.cpp | 1 + src/osgUtil/TriStrip_graph_array.h | 2 ++ src/osgUtil/TriStrip_tri_stripper.h | 1 + src/osgViewer/View.cpp | 2 ++ src/osgWidget/Box.cpp | 1 + 22 files changed, 35 insertions(+), 1 deletion(-) diff --git a/include/osg/AudioStream b/include/osg/AudioStream index 3be9bd9bc..1ad20d275 100644 --- a/include/osg/AudioStream +++ b/include/osg/AudioStream @@ -15,6 +15,7 @@ #define OSG_AUDIOSTREAM 1 #include +#include namespace osg { diff --git a/include/osg/NodeTrackerCallback b/include/osg/NodeTrackerCallback index 05c4c21af..eeac228be 100644 --- a/include/osg/NodeTrackerCallback +++ b/include/osg/NodeTrackerCallback @@ -14,6 +14,8 @@ #ifndef OSG_NODETRACKERCALLBACK #define OSG_NODETRACKERCALLBACK 1 +#include + #include #include #include 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 #include +#include + namespace osgGA{ class OSGGA_EXPORT NodeTrackerManipulator : public MatrixManipulator diff --git a/include/osgWidget/Util b/include/osgWidget/Util index 434886470..3919147b3 100644 --- a/include/osgWidget/Util +++ b/include/osgWidget/Util @@ -16,6 +16,7 @@ #ifndef OSGWIDGET_UTIL #define OSGWIDGET_UTIL +#include #include #include #include diff --git a/src/osg/GraphicsContext.cpp b/src/osg/GraphicsContext.cpp index 78e9741ec..2b5439ed5 100644 --- a/src/osg/GraphicsContext.cpp +++ b/src/osg/GraphicsContext.cpp @@ -31,6 +31,7 @@ #include #include #include +#include using namespace osg; diff --git a/src/osg/Notify.cpp b/src/osg/Notify.cpp index 604d109f6..dc3e1b3ab 100644 --- a/src/osg/Notify.cpp +++ b/src/osg/Notify.cpp @@ -19,6 +19,8 @@ #include #include +#include + namespace osg { diff --git a/src/osgAnimation/StatsHandler.cpp b/src/osgAnimation/StatsHandler.cpp index 7c34756af..fd1c0c624 100644 --- a/src/osgAnimation/StatsHandler.cpp +++ b/src/osgAnimation/StatsHandler.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -440,7 +441,7 @@ struct ValueTextDrawCallback : public virtual osg::Drawable::DrawCallback _actions[name].setPosition(pos); //_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; } diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp index 68a38271e..2df676647 100644 --- a/src/osgDB/DatabasePager.cpp +++ b/src/osgDB/DatabasePager.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp b/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp index 2d5154194..56bd982ee 100644 --- a/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp +++ b/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp @@ -31,6 +31,7 @@ #include #include +#include // FIXME: This header was copied verbatim from the importer, with the only change // being that the symbols it defines are placed in namespace 'fltexp' instead diff --git a/src/osgPresentation/PickEventHandler.cpp b/src/osgPresentation/PickEventHandler.cpp index 71e5f4c36..e1a749d69 100644 --- a/src/osgPresentation/PickEventHandler.cpp +++ b/src/osgPresentation/PickEventHandler.cpp @@ -17,6 +17,8 @@ #include #include +#include + using namespace osgPresentation; PickEventHandler::PickEventHandler(osgPresentation::Operation operation,bool relativeJump, int slideNum, int layerNum): diff --git a/src/osgShadow/ConvexPolyhedron.cpp b/src/osgShadow/ConvexPolyhedron.cpp index ecb77d4a0..bc5d49402 100644 --- a/src/osgShadow/ConvexPolyhedron.cpp +++ b/src/osgShadow/ConvexPolyhedron.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include 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 #include +#include + using namespace osgText; //////////////////////////////////////////////////////////////////////// diff --git a/src/osgUtil/DelaunayTriangulator.cpp b/src/osgUtil/DelaunayTriangulator.cpp index c8925e154..423fd8a01 100644 --- a/src/osgUtil/DelaunayTriangulator.cpp +++ b/src/osgUtil/DelaunayTriangulator.cpp @@ -24,6 +24,8 @@ #include #include //GWM July 2005 map is used in constraints. #include // tessellator triangulates the constrained triangles +#include +#include namespace osgUtil { diff --git a/src/osgUtil/IncrementalCompileOperation.cpp b/src/osgUtil/IncrementalCompileOperation.cpp index 263f469fa..94113ab41 100644 --- a/src/osgUtil/IncrementalCompileOperation.cpp +++ b/src/osgUtil/IncrementalCompileOperation.cpp @@ -20,6 +20,8 @@ #include #include +#include +#include namespace osgUtil { diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp index 306fed1a0..327069a95 100644 --- a/src/osgUtil/Optimizer.cpp +++ b/src/osgUtil/Optimizer.cpp @@ -45,6 +45,8 @@ #include #include +#include + using namespace osgUtil; diff --git a/src/osgUtil/SceneView.cpp b/src/osgUtil/SceneView.cpp index d943d3f63..d34b93dd0 100644 --- a/src/osgUtil/SceneView.cpp +++ b/src/osgUtil/SceneView.cpp @@ -27,6 +27,8 @@ #include +#include + using namespace osg; using namespace osgUtil; diff --git a/src/osgUtil/Simplifier.cpp b/src/osgUtil/Simplifier.cpp index 03bdf8a06..97ce3781a 100644 --- a/src/osgUtil/Simplifier.cpp +++ b/src/osgUtil/Simplifier.cpp @@ -22,6 +22,8 @@ #include #include +#include + using namespace osgUtil; struct dereference_less diff --git a/src/osgUtil/TriStripVisitor.cpp b/src/osgUtil/TriStripVisitor.cpp index 7f9ea5979..758122156 100644 --- a/src/osgUtil/TriStripVisitor.cpp +++ b/src/osgUtil/TriStripVisitor.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include "TriStrip_tri_stripper.h" diff --git a/src/osgUtil/TriStrip_graph_array.h b/src/osgUtil/TriStrip_graph_array.h index a383e32a9..0ec8fb9d7 100644 --- a/src/osgUtil/TriStrip_graph_array.h +++ b/src/osgUtil/TriStrip_graph_array.h @@ -50,6 +50,8 @@ #ifndef TRISTRIP_GRAPH_ARRAY_H #define TRISTRIP_GRAPH_ARRAY_H +#include + // namespace common_structures namespace common_structures { diff --git a/src/osgUtil/TriStrip_tri_stripper.h b/src/osgUtil/TriStrip_tri_stripper.h index b261ac736..4c89a5f20 100644 --- a/src/osgUtil/TriStrip_tri_stripper.h +++ b/src/osgUtil/TriStrip_tri_stripper.h @@ -67,6 +67,7 @@ #include #include +#include // namespace triangle_stripper namespace triangle_stripper { diff --git a/src/osgViewer/View.cpp b/src/osgViewer/View.cpp index 54d3fc511..1846358d6 100644 --- a/src/osgViewer/View.cpp +++ b/src/osgViewer/View.cpp @@ -26,6 +26,8 @@ #include #include +#include + using namespace osgViewer; class CollectedCoordinateSystemNodesVisitor : public osg::NodeVisitor diff --git a/src/osgWidget/Box.cpp b/src/osgWidget/Box.cpp index b0c9d6e03..15e425a14 100644 --- a/src/osgWidget/Box.cpp +++ b/src/osgWidget/Box.cpp @@ -1,5 +1,6 @@ // -*-c++-*- osgWidget - Code by: Jeremy Moles (cubicool) 2007-2008 +#include #include namespace osgWidget {