From a8d4da8163b6942ab3ea169ee0996c611b942c4f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 8 Apr 2005 09:36:42 +0000 Subject: [PATCH] Added #include --- applications/osgdem/osgdem.cpp | 20 +------------------ src/osgPlugins/lws/SceneLoader.cpp | 1 + src/osgPlugins/osg/AnimationPath.cpp | 1 + src/osgPlugins/osg/AutoTransform.cpp | 1 + src/osgPlugins/osg/ClearNode.cpp | 9 +++++---- src/osgPlugins/osg/Fog.cpp | 3 ++- src/osgPlugins/osg/FragmentProgram.cpp | 3 ++- src/osgPlugins/osg/Geometry.cpp | 1 + src/osgPlugins/osg/LOD.cpp | 1 + src/osgPlugins/osg/Light.cpp | 1 + src/osgPlugins/osg/LightModel.cpp | 1 + src/osgPlugins/osg/Material.cpp | 1 + src/osgPlugins/osg/Point.cpp | 1 + .../osg/PositionAttitudeTransform.cpp | 1 + src/osgPlugins/osg/ProxyNode.cpp | 1 + src/osgPlugins/osg/Shape.cpp | 1 + src/osgPlugins/osg/ShapeDrawable.cpp | 1 + src/osgPlugins/osg/TexEnv.cpp | 1 + src/osgPlugins/osg/TexEnvCombine.cpp | 1 + src/osgPlugins/osg/Texture.cpp | 1 + src/osgPlugins/osg/VertexProgram.cpp | 1 + src/osgPlugins/osgFX/IO_Cartoon.cpp | 1 + src/osgPlugins/osgFX/IO_Scribe.cpp | 1 + .../osgFX/IO_SpecularHighlights.cpp | 1 + .../osgParticle/IO_ParticleEffect.cpp | 2 +- src/osgPlugins/osgSim/IO_BlinkSequence.cpp | 1 + src/osgPlugins/osgSim/IO_DOFTransform.cpp | 1 + src/osgPlugins/osgSim/IO_LightPoint.cpp | 2 ++ src/osgPlugins/osgSim/IO_Sector.cpp | 1 + 29 files changed, 36 insertions(+), 26 deletions(-) diff --git a/applications/osgdem/osgdem.cpp b/applications/osgdem/osgdem.cpp index 151b1f109..f94d27d74 100644 --- a/applications/osgdem/osgdem.cpp +++ b/applications/osgdem/osgdem.cpp @@ -9,29 +9,11 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -#ifdef WIN32 - -///////////////////////////////////////////////////////////////////////////// -// Disable unavoidable warning messages: - -// 4114: same type qualifier used more than once -// 4201: nonstandard extension used : nameless struct/union -// 4237: "keyword" reserved for future use -// 4251: class needs to have dll-interface to export class -// 4275: non DLL-interface class used as base for DLL-interface class -// 4290: C++ Exception Specification ignored -// 4503: ecorated name length exceeded, name was truncated -// 4786: string too long - truncated to 255 characters - -//#pragma warning(disable : 4103 4114 4201 4237 4251 4275 4290 4335 4786) -#pragma warning(disable : 4503) - -#endif // WIN32 - #include #include #include #include +#include #include #include diff --git a/src/osgPlugins/lws/SceneLoader.cpp b/src/osgPlugins/lws/SceneLoader.cpp index 78b48a369..c667832e9 100644 --- a/src/osgPlugins/lws/SceneLoader.cpp +++ b/src/osgPlugins/lws/SceneLoader.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include diff --git a/src/osgPlugins/osg/AnimationPath.cpp b/src/osgPlugins/osg/AnimationPath.cpp index f60c3a1f5..767103f29 100644 --- a/src/osgPlugins/osg/AnimationPath.cpp +++ b/src/osgPlugins/osg/AnimationPath.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include diff --git a/src/osgPlugins/osg/AutoTransform.cpp b/src/osgPlugins/osg/AutoTransform.cpp index 6e247546e..fd1be5417 100644 --- a/src/osgPlugins/osg/AutoTransform.cpp +++ b/src/osgPlugins/osg/AutoTransform.cpp @@ -1,4 +1,5 @@ #include +#include #include #include diff --git a/src/osgPlugins/osg/ClearNode.cpp b/src/osgPlugins/osg/ClearNode.cpp index bc281c5ba..1687b9dc4 100644 --- a/src/osgPlugins/osg/ClearNode.cpp +++ b/src/osgPlugins/osg/ClearNode.cpp @@ -1,8 +1,9 @@ -#include "osg/ClearNode" +#include +#include -#include "osgDB/Registry" -#include "osgDB/Input" -#include "osgDB/Output" +#include +#include +#include using namespace osg; using namespace osgDB; diff --git a/src/osgPlugins/osg/Fog.cpp b/src/osgPlugins/osg/Fog.cpp index 4204d0496..4fd86b721 100644 --- a/src/osgPlugins/osg/Fog.cpp +++ b/src/osgPlugins/osg/Fog.cpp @@ -2,7 +2,8 @@ #pragma warning( disable : 4786 ) #endif -#include "osg/Fog" +#include +#include #include "osgDB/Registry" #include "osgDB/Input" diff --git a/src/osgPlugins/osg/FragmentProgram.cpp b/src/osgPlugins/osg/FragmentProgram.cpp index 24d19895c..303c3d06d 100644 --- a/src/osgPlugins/osg/FragmentProgram.cpp +++ b/src/osgPlugins/osg/FragmentProgram.cpp @@ -1,4 +1,5 @@ -#include "osg/FragmentProgram" +#include +#include #include #include diff --git a/src/osgPlugins/osg/Geometry.cpp b/src/osgPlugins/osg/Geometry.cpp index 213c5de5f..855b66862 100644 --- a/src/osgPlugins/osg/Geometry.cpp +++ b/src/osgPlugins/osg/Geometry.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include diff --git a/src/osgPlugins/osg/LOD.cpp b/src/osgPlugins/osg/LOD.cpp index 406eca64f..928c53d3e 100644 --- a/src/osgPlugins/osg/LOD.cpp +++ b/src/osgPlugins/osg/LOD.cpp @@ -1,4 +1,5 @@ #include "osg/LOD" +#include #include "osgDB/Registry" #include "osgDB/Input" diff --git a/src/osgPlugins/osg/Light.cpp b/src/osgPlugins/osg/Light.cpp index e7b36efc6..947f570fd 100644 --- a/src/osgPlugins/osg/Light.cpp +++ b/src/osgPlugins/osg/Light.cpp @@ -3,6 +3,7 @@ #endif #include "osg/Light" +#include #include "osgDB/Registry" #include "osgDB/Input" diff --git a/src/osgPlugins/osg/LightModel.cpp b/src/osgPlugins/osg/LightModel.cpp index 2e5238be9..60b454a9f 100644 --- a/src/osgPlugins/osg/LightModel.cpp +++ b/src/osgPlugins/osg/LightModel.cpp @@ -1,4 +1,5 @@ #include +#include #include #include diff --git a/src/osgPlugins/osg/Material.cpp b/src/osgPlugins/osg/Material.cpp index 727d211ba..dc62d752c 100644 --- a/src/osgPlugins/osg/Material.cpp +++ b/src/osgPlugins/osg/Material.cpp @@ -3,6 +3,7 @@ #endif #include "osg/Material" +#include #include "osgDB/Registry" #include "osgDB/Input" diff --git a/src/osgPlugins/osg/Point.cpp b/src/osgPlugins/osg/Point.cpp index 6652eed3d..84fd0b3d6 100644 --- a/src/osgPlugins/osg/Point.cpp +++ b/src/osgPlugins/osg/Point.cpp @@ -3,6 +3,7 @@ #endif #include "osg/Point" +#include #include "osgDB/Registry" #include "osgDB/Input" diff --git a/src/osgPlugins/osg/PositionAttitudeTransform.cpp b/src/osgPlugins/osg/PositionAttitudeTransform.cpp index 38192b383..59a43e6f3 100644 --- a/src/osgPlugins/osg/PositionAttitudeTransform.cpp +++ b/src/osgPlugins/osg/PositionAttitudeTransform.cpp @@ -1,4 +1,5 @@ #include "osg/PositionAttitudeTransform" +#include #include "osgDB/Registry" #include "osgDB/Input" diff --git a/src/osgPlugins/osg/ProxyNode.cpp b/src/osgPlugins/osg/ProxyNode.cpp index 9e904ab55..436328ae0 100644 --- a/src/osgPlugins/osg/ProxyNode.cpp +++ b/src/osgPlugins/osg/ProxyNode.cpp @@ -1,5 +1,6 @@ #include "osg/ProxyNode" #include "osg/Notify" +#include #include "osgDB/Registry" #include "osgDB/Input" diff --git a/src/osgPlugins/osg/Shape.cpp b/src/osgPlugins/osg/Shape.cpp index 57faf3efd..ada94e568 100644 --- a/src/osgPlugins/osg/Shape.cpp +++ b/src/osgPlugins/osg/Shape.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include diff --git a/src/osgPlugins/osg/ShapeDrawable.cpp b/src/osgPlugins/osg/ShapeDrawable.cpp index ddefbc2af..23f7ff90d 100644 --- a/src/osgPlugins/osg/ShapeDrawable.cpp +++ b/src/osgPlugins/osg/ShapeDrawable.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include diff --git a/src/osgPlugins/osg/TexEnv.cpp b/src/osgPlugins/osg/TexEnv.cpp index 84b5d02e9..5d5e003b9 100644 --- a/src/osgPlugins/osg/TexEnv.cpp +++ b/src/osgPlugins/osg/TexEnv.cpp @@ -1,4 +1,5 @@ #include "osg/TexEnv" +#include #include "osgDB/Registry" #include "osgDB/Input" diff --git a/src/osgPlugins/osg/TexEnvCombine.cpp b/src/osgPlugins/osg/TexEnvCombine.cpp index 61e09522f..d4f0bc19a 100644 --- a/src/osgPlugins/osg/TexEnvCombine.cpp +++ b/src/osgPlugins/osg/TexEnvCombine.cpp @@ -1,4 +1,5 @@ #include "osg/TexEnvCombine" +#include #include "osgDB/Registry" #include "osgDB/Input" diff --git a/src/osgPlugins/osg/Texture.cpp b/src/osgPlugins/osg/Texture.cpp index 0904f06fb..424ad1929 100644 --- a/src/osgPlugins/osg/Texture.cpp +++ b/src/osgPlugins/osg/Texture.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include diff --git a/src/osgPlugins/osg/VertexProgram.cpp b/src/osgPlugins/osg/VertexProgram.cpp index 9b0a39730..8bfddabf2 100644 --- a/src/osgPlugins/osg/VertexProgram.cpp +++ b/src/osgPlugins/osg/VertexProgram.cpp @@ -1,4 +1,5 @@ #include "osg/VertexProgram" +#include #include #include diff --git a/src/osgPlugins/osgFX/IO_Cartoon.cpp b/src/osgPlugins/osgFX/IO_Cartoon.cpp index 83ec5b4c9..14651ff69 100644 --- a/src/osgPlugins/osgFX/IO_Cartoon.cpp +++ b/src/osgPlugins/osgFX/IO_Cartoon.cpp @@ -1,4 +1,5 @@ #include +#include #include #include diff --git a/src/osgPlugins/osgFX/IO_Scribe.cpp b/src/osgPlugins/osgFX/IO_Scribe.cpp index cbb0f058b..99185de18 100644 --- a/src/osgPlugins/osgFX/IO_Scribe.cpp +++ b/src/osgPlugins/osgFX/IO_Scribe.cpp @@ -1,4 +1,5 @@ #include +#include #include #include diff --git a/src/osgPlugins/osgFX/IO_SpecularHighlights.cpp b/src/osgPlugins/osgFX/IO_SpecularHighlights.cpp index 9bf573588..c750b51f5 100644 --- a/src/osgPlugins/osgFX/IO_SpecularHighlights.cpp +++ b/src/osgPlugins/osgFX/IO_SpecularHighlights.cpp @@ -1,4 +1,5 @@ #include +#include #include #include diff --git a/src/osgPlugins/osgParticle/IO_ParticleEffect.cpp b/src/osgPlugins/osgParticle/IO_ParticleEffect.cpp index f1eca92e5..57a453fc4 100644 --- a/src/osgPlugins/osgParticle/IO_ParticleEffect.cpp +++ b/src/osgPlugins/osgParticle/IO_ParticleEffect.cpp @@ -1,5 +1,5 @@ - #include +#include #include #include diff --git a/src/osgPlugins/osgSim/IO_BlinkSequence.cpp b/src/osgPlugins/osgSim/IO_BlinkSequence.cpp index 25a65fb77..dff0961e7 100644 --- a/src/osgPlugins/osgSim/IO_BlinkSequence.cpp +++ b/src/osgPlugins/osgSim/IO_BlinkSequence.cpp @@ -1,4 +1,5 @@ #include +#include #include #include diff --git a/src/osgPlugins/osgSim/IO_DOFTransform.cpp b/src/osgPlugins/osgSim/IO_DOFTransform.cpp index 47ef2ff3f..80b449c74 100644 --- a/src/osgPlugins/osgSim/IO_DOFTransform.cpp +++ b/src/osgPlugins/osgSim/IO_DOFTransform.cpp @@ -1,4 +1,5 @@ #include "osgSim/DOFTransform" +#include #include "osgDB/Registry" #include "osgDB/Input" diff --git a/src/osgPlugins/osgSim/IO_LightPoint.cpp b/src/osgPlugins/osgSim/IO_LightPoint.cpp index 31e60ff85..407d75ff1 100644 --- a/src/osgPlugins/osgSim/IO_LightPoint.cpp +++ b/src/osgPlugins/osgSim/IO_LightPoint.cpp @@ -1,4 +1,6 @@ #include +#include + #include #include "IO_LightPoint.h" diff --git a/src/osgPlugins/osgSim/IO_Sector.cpp b/src/osgPlugins/osgSim/IO_Sector.cpp index 36da0832e..8c88740dd 100644 --- a/src/osgPlugins/osgSim/IO_Sector.cpp +++ b/src/osgPlugins/osgSim/IO_Sector.cpp @@ -1,4 +1,5 @@ #include +#include #include #include