From c1283c23e829672199fbec364dfc6b9d7653301c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sun, 3 Feb 2002 12:33:41 +0000 Subject: [PATCH] Removed the trailing ; after namespace {...} declariations in headers which was being picked as a warning under Codewarrior. --- include/osg/AlphaFunc | 2 +- include/osg/Billboard | 2 +- include/osg/BoundingBox | 2 +- include/osg/BoundingSphere | 2 +- include/osg/ClipPlane | 2 +- include/osg/ClippingVolume | 3 ++- include/osg/ColorMask | 2 +- include/osg/ColorMatrix | 2 +- include/osg/CopyOp | 2 +- include/osg/CullFace | 2 +- include/osg/Depth | 2 +- include/osg/Drawable | 2 +- include/osg/EarthSky | 2 +- include/osg/Fog | 2 +- include/osg/FrameStamp | 2 +- include/osg/FrontFace | 2 +- include/osg/GLExtensions | 2 +- include/osg/GeoSet | 2 +- include/osg/Geode | 2 +- include/osg/Group | 2 +- include/osg/Image | 2 +- include/osg/Impostor | 2 +- include/osg/ImpostorSprite | 2 +- include/osg/LOD | 2 +- include/osg/Light | 2 +- include/osg/LightSource | 2 +- include/osg/LineSegment | 2 +- include/osg/LineWidth | 2 +- include/osg/Material | 2 +- include/osg/Math | 2 +- include/osg/Matrix | 2 +- include/osg/MemoryAdapter | 2 +- include/osg/Node | 2 +- include/osg/NodeCallback | 2 +- include/osg/NodeVisitor | 2 +- include/osg/Notify | 2 +- include/osg/Object | 2 +- include/osg/Plane | 3 ++- include/osg/Point | 2 +- include/osg/PolygonMode | 2 +- include/osg/PolygonOffset | 2 +- include/osg/PositionAttitudeTransform | 2 +- include/osg/Quat | 3 ++- include/osg/Referenced | 2 +- include/osg/ShadeModel | 2 +- include/osg/State | 2 +- include/osg/StateAttribute | 2 +- include/osg/StateSet | 2 +- include/osg/Statistics | 2 +- include/osg/Stencil | 2 +- include/osg/Switch | 2 +- include/osg/TexEnv | 2 +- include/osg/TexGen | 2 +- include/osg/TexMat | 2 +- include/osg/Texture | 2 +- include/osg/Timer | 12 ++++++------ include/osg/Transform | 2 +- include/osg/Transparency | 2 +- include/osg/Types | 2 +- include/osg/Version | 2 +- include/osg/Viewport | 2 +- include/osg/mem_ptr | 2 +- include/osg/ref_ptr | 2 +- include/osgDB/DotOsgWrapper | 2 +- include/osgDB/DynamicLibrary | 2 +- include/osgDB/Field | 2 +- include/osgDB/FieldReader | 2 +- include/osgDB/FieldReaderIterator | 2 +- include/osgDB/FileNameUtils | 2 +- include/osgDB/FileUtils | 2 +- include/osgDB/Input | 2 +- include/osgDB/Output | 3 +-- include/osgDB/ReadFile | 2 +- include/osgDB/ReaderWriter | 3 +-- include/osgDB/Registry | 2 +- include/osgDB/Version | 2 +- include/osgDB/WriteFile | 2 +- include/osgGLUT/Version | 2 +- include/osgGLUT/Window | 2 +- include/osgText/Font | 3 +-- include/osgText/Paragraph | 2 +- include/osgText/Text | 2 +- include/osgText/Version | 2 +- include/osgUtil/AppVisitor | 2 +- include/osgUtil/CullViewState | 3 +-- include/osgUtil/CullVisitor | 2 +- include/osgUtil/DepthSortedBin | 2 +- include/osgUtil/DisplayListVisitor | 2 +- include/osgUtil/DisplayRequirementsVisitor | 2 +- include/osgUtil/GUIEventHandler | 2 +- include/osgUtil/InsertImpostorsVisitor | 2 +- include/osgUtil/IntersectVisitor | 2 +- include/osgUtil/Optimizer | 2 +- include/osgUtil/RenderBin | 2 +- include/osgUtil/RenderGraph | 2 +- include/osgUtil/RenderLeaf | 2 +- include/osgUtil/RenderStage | 2 +- include/osgUtil/RenderStageLighting | 2 +- include/osgUtil/RenderToTextureStage | 2 +- include/osgUtil/SceneView | 2 +- include/osgUtil/SmoothingVisitor | 2 +- include/osgUtil/Tesselator | 2 +- include/osgUtil/TransformCallback | 2 +- include/osgUtil/TriStripVisitor | 2 +- include/osgUtil/Version | 2 +- include/osgWX/Version | 2 +- 106 files changed, 114 insertions(+), 115 deletions(-) diff --git a/include/osg/AlphaFunc b/include/osg/AlphaFunc index c1a7cc640..0920a3981 100644 --- a/include/osg/AlphaFunc +++ b/include/osg/AlphaFunc @@ -78,6 +78,6 @@ class SG_EXPORT AlphaFunc : public StateAttribute }; -}; +} #endif diff --git a/include/osg/Billboard b/include/osg/Billboard index e8acecb19..b580abb9c 100644 --- a/include/osg/Billboard +++ b/include/osg/Billboard @@ -106,6 +106,6 @@ class SG_EXPORT Billboard : public Geode }; -}; +} #endif diff --git a/include/osg/BoundingBox b/include/osg/BoundingBox index 86fedaabb..ffcfa6d82 100644 --- a/include/osg/BoundingBox +++ b/include/osg/BoundingBox @@ -141,6 +141,6 @@ class SG_EXPORT BoundingBox } }; -}; +} #endif diff --git a/include/osg/BoundingSphere b/include/osg/BoundingSphere index c486b83e3..29994d0d6 100644 --- a/include/osg/BoundingSphere +++ b/include/osg/BoundingSphere @@ -101,6 +101,6 @@ class SG_EXPORT BoundingSphere }; -}; +} #endif diff --git a/include/osg/ClipPlane b/include/osg/ClipPlane index 00f0ee0dc..09db18045 100644 --- a/include/osg/ClipPlane +++ b/include/osg/ClipPlane @@ -90,6 +90,6 @@ class SG_EXPORT ClipPlane : public StateAttribute }; -}; +} #endif diff --git a/include/osg/ClippingVolume b/include/osg/ClippingVolume index 92c63c72e..169680e57 100644 --- a/include/osg/ClippingVolume +++ b/include/osg/ClippingVolume @@ -177,5 +177,6 @@ class SG_EXPORT ClippingVolume }; -}; // end of namespace +} // end of namespace + #endif diff --git a/include/osg/ColorMask b/include/osg/ColorMask index 1a41dd0ef..f44013409 100644 --- a/include/osg/ColorMask +++ b/include/osg/ColorMask @@ -76,6 +76,6 @@ class SG_EXPORT ColorMask : public StateAttribute }; -}; +} #endif diff --git a/include/osg/ColorMatrix b/include/osg/ColorMatrix index 06cdec0f6..794e0c410 100644 --- a/include/osg/ColorMatrix +++ b/include/osg/ColorMatrix @@ -57,7 +57,7 @@ class SG_EXPORT ColorMatrix : public StateAttribute }; -}; +} #endif diff --git a/include/osg/CopyOp b/include/osg/CopyOp index dc2b214b0..8f628abea 100644 --- a/include/osg/CopyOp +++ b/include/osg/CopyOp @@ -57,6 +57,6 @@ class SG_EXPORT CopyOp CopyFlags _flags; }; -}; +} #endif diff --git a/include/osg/CullFace b/include/osg/CullFace index 7c2ac1293..9d27b17be 100644 --- a/include/osg/CullFace +++ b/include/osg/CullFace @@ -64,6 +64,6 @@ class SG_EXPORT CullFace : public StateAttribute }; -}; +} #endif diff --git a/include/osg/Depth b/include/osg/Depth index d946cb924..92a76f1c1 100644 --- a/include/osg/Depth +++ b/include/osg/Depth @@ -96,6 +96,6 @@ class SG_EXPORT Depth : public StateAttribute }; -}; +} #endif diff --git a/include/osg/Drawable b/include/osg/Drawable index e7ae65cc2..b2842e770 100644 --- a/include/osg/Drawable +++ b/include/osg/Drawable @@ -270,6 +270,6 @@ inline void Drawable::draw(State& state) } } -}; +} #endif diff --git a/include/osg/EarthSky b/include/osg/EarthSky index d9c0ce2dd..ce83f305e 100644 --- a/include/osg/EarthSky +++ b/include/osg/EarthSky @@ -54,6 +54,6 @@ class SG_EXPORT EarthSky : public Group Vec4 _clearColor; }; -}; +} #endif diff --git a/include/osg/Fog b/include/osg/Fog index dd31f4bf9..34bd6e7f8 100644 --- a/include/osg/Fog +++ b/include/osg/Fog @@ -87,6 +87,6 @@ class SG_EXPORT Fog : public StateAttribute Vec4 _color; }; -}; +} #endif diff --git a/include/osg/FrameStamp b/include/osg/FrameStamp index 889d358d8..9f570f44f 100644 --- a/include/osg/FrameStamp +++ b/include/osg/FrameStamp @@ -69,7 +69,7 @@ class SG_EXPORT FrameStamp : public Referenced }; -}; +} #endif diff --git a/include/osg/FrontFace b/include/osg/FrontFace index 721df3639..133741768 100644 --- a/include/osg/FrontFace +++ b/include/osg/FrontFace @@ -56,6 +56,6 @@ class SG_EXPORT FrontFace : public StateAttribute }; -}; +} #endif diff --git a/include/osg/GLExtensions b/include/osg/GLExtensions index eed38ad1e..eb04bf918 100644 --- a/include/osg/GLExtensions +++ b/include/osg/GLExtensions @@ -20,6 +20,6 @@ SG_EXPORT extern const bool isGLExtensionSupported(const char *extension); */ SG_EXPORT extern void* getGLExtensionFuncPtr(const char *funcName); -}; +} #endif diff --git a/include/osg/GeoSet b/include/osg/GeoSet index 3e1eda61d..258f77cd0 100644 --- a/include/osg/GeoSet +++ b/include/osg/GeoSet @@ -685,6 +685,6 @@ void for_each_triangle(GeoSet& gset,T& op) }; -}; +} #endif diff --git a/include/osg/Geode b/include/osg/Geode index 131f39217..40922955e 100644 --- a/include/osg/Geode +++ b/include/osg/Geode @@ -118,6 +118,6 @@ class SG_EXPORT Geode : public Node }; -}; +} #endif diff --git a/include/osg/Group b/include/osg/Group index de3e28e1d..a5fcda718 100644 --- a/include/osg/Group +++ b/include/osg/Group @@ -118,6 +118,6 @@ class SG_EXPORT Group : public Node }; -}; +} #endif diff --git a/include/osg/Image b/include/osg/Image index 69be76f87..fcc366a5f 100644 --- a/include/osg/Image +++ b/include/osg/Image @@ -112,6 +112,6 @@ SG_EXPORT extern Geode* createGeodeForImage(Image* image); */ SG_EXPORT extern Geode* createGeodeForImage(Image* image,const float s,const float t); -}; +} #endif // __SG_IMAGE_H diff --git a/include/osg/Impostor b/include/osg/Impostor index 2cb955f4e..223d2b601 100644 --- a/include/osg/Impostor +++ b/include/osg/Impostor @@ -101,6 +101,6 @@ class SG_EXPORT Impostor : public LOD }; -}; +} #endif diff --git a/include/osg/ImpostorSprite b/include/osg/ImpostorSprite index fe807fb24..70d7c4063 100644 --- a/include/osg/ImpostorSprite +++ b/include/osg/ImpostorSprite @@ -187,6 +187,6 @@ class SG_EXPORT ImpostorSpriteManager : public Referenced }; -}; +} #endif diff --git a/include/osg/LOD b/include/osg/LOD index 182018d93..67221d9a6 100644 --- a/include/osg/LOD +++ b/include/osg/LOD @@ -73,6 +73,6 @@ class SG_EXPORT LOD : public Group }; -}; +} #endif diff --git a/include/osg/Light b/include/osg/Light index 7075510d1..86abea598 100644 --- a/include/osg/Light +++ b/include/osg/Light @@ -160,6 +160,6 @@ class SG_EXPORT Light : public StateAttribute float _spot_cutoff; // spread }; -}; +} #endif diff --git a/include/osg/LightSource b/include/osg/LightSource index 4bbd90ea9..93bd19bce 100644 --- a/include/osg/LightSource +++ b/include/osg/LightSource @@ -42,6 +42,6 @@ class SG_EXPORT LightSource : public Node ref_ptr _light; }; -}; +} #endif diff --git a/include/osg/LineSegment b/include/osg/LineSegment index e408b46ce..1c31ece45 100644 --- a/include/osg/LineSegment +++ b/include/osg/LineSegment @@ -62,6 +62,6 @@ class SG_EXPORT LineSegment : public Referenced Vec3 _e; }; -}; +} #endif diff --git a/include/osg/LineWidth b/include/osg/LineWidth index a60e0523c..4d6742fa2 100644 --- a/include/osg/LineWidth +++ b/include/osg/LineWidth @@ -50,6 +50,6 @@ class SG_EXPORT LineWidth : public StateAttribute }; -}; +} #endif diff --git a/include/osg/Material b/include/osg/Material index 86001a15a..04ebf39b4 100644 --- a/include/osg/Material +++ b/include/osg/Material @@ -164,6 +164,6 @@ class SG_EXPORT Material : public StateAttribute }; -}; +} #endif diff --git a/include/osg/Math b/include/osg/Math index 3623088a9..2d848bc68 100644 --- a/include/osg/Math +++ b/include/osg/Math @@ -72,6 +72,6 @@ inline double RadiansToDegrees(double angle) { return angle*180.0/PI; } inline bool isNaN(double v) { return isnan(v); } #endif -}; +} #endif // __OSG_MATH diff --git a/include/osg/Matrix b/include/osg/Matrix index e7bac75d4..233e489e9 100644 --- a/include/osg/Matrix +++ b/include/osg/Matrix @@ -288,7 +288,7 @@ inline std::ostream& operator<< (std::ostream& os, const Matrix& m ) } -}; //namespace osg +} //namespace osg #endif diff --git a/include/osg/MemoryAdapter b/include/osg/MemoryAdapter index 2f1e7a4cb..03c0e95b0 100644 --- a/include/osg/MemoryAdapter +++ b/include/osg/MemoryAdapter @@ -36,6 +36,6 @@ class SG_EXPORT MemoryAdapter : public Referenced virtual ~MemoryAdapter() {} }; -}; +} #endif diff --git a/include/osg/Node b/include/osg/Node index 1bd9c8f51..7e403158b 100644 --- a/include/osg/Node +++ b/include/osg/Node @@ -234,6 +234,6 @@ class SG_EXPORT Node : public Object /** A vector of Nodes pointers which is used to describe the path from a root node to a descendant.*/ typedef std::vector NodePath; -}; +} #endif diff --git a/include/osg/NodeCallback b/include/osg/NodeCallback index f3b036f66..e6bb7f297 100644 --- a/include/osg/NodeCallback +++ b/include/osg/NodeCallback @@ -85,7 +85,7 @@ class SG_EXPORT NodeCallback : public Referenced { ref_ptr _nestedCallback; }; -}; // namespace +} // namespace #endif diff --git a/include/osg/NodeVisitor b/include/osg/NodeVisitor index b847edd83..d2314320e 100644 --- a/include/osg/NodeVisitor +++ b/include/osg/NodeVisitor @@ -171,6 +171,6 @@ struct NodeAcceptOp void operator () (ref_ptr node) { node->accept(_nv); } }; -}; +} #endif diff --git a/include/osg/Notify b/include/osg/Notify index 74c57705f..b0747e758 100644 --- a/include/osg/Notify +++ b/include/osg/Notify @@ -82,6 +82,6 @@ inline std::ostream& notify(const NotifySeverity severity) inline std::ostream& notify(void) { return notify(osg::INFO); } -}; +} #endif diff --git a/include/osg/Object b/include/osg/Object index a409034eb..146c8301d 100644 --- a/include/osg/Object +++ b/include/osg/Object @@ -71,6 +71,6 @@ class SG_EXPORT Object : public Referenced Object& operator = (const Object&) { return *this; } }; -}; +} #endif diff --git a/include/osg/Plane b/include/osg/Plane index 053e86fa0..05f2c19c8 100644 --- a/include/osg/Plane +++ b/include/osg/Plane @@ -165,5 +165,6 @@ inline std::ostream& operator << (std::ostream& output, const Plane& pl) return output; // to enable cascading } -}; // end of namespace +} // end of namespace + #endif diff --git a/include/osg/Point b/include/osg/Point index 98d739d1d..cc8d80e88 100644 --- a/include/osg/Point +++ b/include/osg/Point @@ -70,6 +70,6 @@ class SG_EXPORT Point : public StateAttribute }; -}; +} #endif diff --git a/include/osg/PolygonMode b/include/osg/PolygonMode index 858a044f6..55b976b50 100644 --- a/include/osg/PolygonMode +++ b/include/osg/PolygonMode @@ -72,6 +72,6 @@ class SG_EXPORT PolygonMode : public StateAttribute }; -}; +} #endif diff --git a/include/osg/PolygonOffset b/include/osg/PolygonOffset index 31f5ca521..935c6c3ba 100644 --- a/include/osg/PolygonOffset +++ b/include/osg/PolygonOffset @@ -63,6 +63,6 @@ class SG_EXPORT PolygonOffset : public StateAttribute }; -}; +} #endif diff --git a/include/osg/PositionAttitudeTransform b/include/osg/PositionAttitudeTransform index 7b96fe041..cee2cec1e 100644 --- a/include/osg/PositionAttitudeTransform +++ b/include/osg/PositionAttitudeTransform @@ -48,6 +48,6 @@ class SG_EXPORT PositionAttitudeTransform : public Transform }; -}; +} #endif diff --git a/include/osg/Quat b/include/osg/Quat index 60720d20f..615e47613 100644 --- a/include/osg/Quat +++ b/include/osg/Quat @@ -238,5 +238,6 @@ inline std::ostream& operator << (std::ostream& output, const Quat& vec) return output; // to enable cascading } -}; // end of namespace +} // end of namespace + #endif diff --git a/include/osg/Referenced b/include/osg/Referenced index e158d3470..2579379cc 100644 --- a/include/osg/Referenced +++ b/include/osg/Referenced @@ -37,6 +37,6 @@ class SG_EXPORT Referenced }; -}; +} #endif diff --git a/include/osg/ShadeModel b/include/osg/ShadeModel index 4b1089b57..6db6ad555 100644 --- a/include/osg/ShadeModel +++ b/include/osg/ShadeModel @@ -59,6 +59,6 @@ class SG_EXPORT ShadeModel : public StateAttribute }; -}; +} #endif diff --git a/include/osg/State b/include/osg/State index 19ed151dd..73a17c79d 100644 --- a/include/osg/State +++ b/include/osg/State @@ -214,6 +214,6 @@ class SG_EXPORT State : public Referenced }; -}; +} #endif diff --git a/include/osg/StateAttribute b/include/osg/StateAttribute index fadb6995c..633096a58 100644 --- a/include/osg/StateAttribute +++ b/include/osg/StateAttribute @@ -199,6 +199,6 @@ class SG_EXPORT StateAttribute : public Object }; -}; +} #endif diff --git a/include/osg/StateSet b/include/osg/StateSet index 3b4b94796..8ab3e476f 100644 --- a/include/osg/StateSet +++ b/include/osg/StateSet @@ -171,6 +171,6 @@ class SG_EXPORT StateSet : public Object }; -}; +} #endif diff --git a/include/osg/Statistics b/include/osg/Statistics index c14d7b0f1..e8fb3bcd3 100644 --- a/include/osg/Statistics +++ b/include/osg/Statistics @@ -110,6 +110,6 @@ public: }; -}; +} #endif diff --git a/include/osg/Stencil b/include/osg/Stencil index 8272b7274..8b7c57ef8 100644 --- a/include/osg/Stencil +++ b/include/osg/Stencil @@ -141,6 +141,6 @@ class SG_EXPORT Stencil : public StateAttribute }; -}; +} #endif diff --git a/include/osg/Switch b/include/osg/Switch index 53fa1da6b..e6a8618c5 100644 --- a/include/osg/Switch +++ b/include/osg/Switch @@ -59,6 +59,6 @@ class SG_EXPORT Switch : public Group int _value; }; -}; +} #endif diff --git a/include/osg/TexEnv b/include/osg/TexEnv index a15462d86..259091170 100644 --- a/include/osg/TexEnv +++ b/include/osg/TexEnv @@ -58,6 +58,6 @@ class SG_EXPORT TexEnv : public StateAttribute Mode _mode; }; -}; +} #endif diff --git a/include/osg/TexGen b/include/osg/TexGen index 8396d6a4e..b87fbe98b 100644 --- a/include/osg/TexGen +++ b/include/osg/TexGen @@ -97,6 +97,6 @@ class SG_EXPORT TexGen : public StateAttribute }; -}; +} #endif diff --git a/include/osg/TexMat b/include/osg/TexMat index 758587731..a274d1e45 100644 --- a/include/osg/TexMat +++ b/include/osg/TexMat @@ -57,7 +57,7 @@ class SG_EXPORT TexMat : public StateAttribute }; -}; +} #endif diff --git a/include/osg/Texture b/include/osg/Texture index cfcda4cc5..ed55e955a 100644 --- a/include/osg/Texture +++ b/include/osg/Texture @@ -322,6 +322,6 @@ class SG_EXPORT Texture : public StateAttribute }; -}; +} #endif diff --git a/include/osg/Timer b/include/osg/Timer index 37f52b4d9..16be9d32c 100644 --- a/include/osg/Timer +++ b/include/osg/Timer @@ -59,7 +59,7 @@ class SG_EXPORT Timer { }; -}; +} #if defined(_WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__)) #include @@ -89,7 +89,7 @@ namespace osg{ return ts; } -}; +} #pragma optimize("",on) #elif defined(__linux) || defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__MINGW32__) @@ -114,7 +114,7 @@ namespace osg{ } } -}; +} #elif defined(__sgi) @@ -135,7 +135,7 @@ namespace osg{ return *_clockAddress; } } -}; +} #elif defined(unix) @@ -148,7 +148,7 @@ namespace osg{ gettimeofday(&tv, NULL); return ((osg::Timer_t)tv.tv_sec)*1000000+(osg::Timer_t)tv.tv_usec; } -}; +} #elif !defined (__DARWIN_OSX__) && !defined (macintosh) @@ -157,7 +157,7 @@ namespace osg{ namespace osg{ inline Timer_t Timer::tick( void ) const { return std::clock(); } -}; +} #endif diff --git a/include/osg/Transform b/include/osg/Transform index 3f631c590..f7143dccd 100644 --- a/include/osg/Transform +++ b/include/osg/Transform @@ -117,6 +117,6 @@ class SG_EXPORT Transform : public Group mutable ref_ptr _worldToLocal; }; -}; +} #endif diff --git a/include/osg/Transparency b/include/osg/Transparency index 98a2d70d1..afde287c9 100644 --- a/include/osg/Transparency +++ b/include/osg/Transparency @@ -80,6 +80,6 @@ class SG_EXPORT Transparency : public StateAttribute int _destination_factor; }; -}; +} #endif diff --git a/include/osg/Types b/include/osg/Types index 03f0fc93b..01d128eb1 100644 --- a/include/osg/Types +++ b/include/osg/Types @@ -12,6 +12,6 @@ typedef unsigned short ushort; typedef unsigned char uchar; typedef uchar ubyte; -}; +} #endif diff --git a/include/osg/Version b/include/osg/Version index 05e75394a..6f4b347c9 100644 --- a/include/osg/Version +++ b/include/osg/Version @@ -32,6 +32,6 @@ extern SG_EXPORT const char* osgGetVersion(); */ extern SG_EXPORT const char* osgGetLibraryName(); -}; +} #endif diff --git a/include/osg/Viewport b/include/osg/Viewport index c14f45bb6..84b61749a 100644 --- a/include/osg/Viewport +++ b/include/osg/Viewport @@ -86,6 +86,6 @@ class SG_EXPORT Viewport : public StateAttribute }; -}; +} #endif diff --git a/include/osg/mem_ptr b/include/osg/mem_ptr index 7acc98d96..9984c1c47 100644 --- a/include/osg/mem_ptr +++ b/include/osg/mem_ptr @@ -201,6 +201,6 @@ class mem_ptr // }; -}; +} #endif diff --git a/include/osg/ref_ptr b/include/osg/ref_ptr index 9192eb799..6b8d62ab0 100644 --- a/include/osg/ref_ptr +++ b/include/osg/ref_ptr @@ -99,6 +99,6 @@ class ref_ptr T* _ptr; }; -}; +} #endif diff --git a/include/osgDB/DotOsgWrapper b/include/osgDB/DotOsgWrapper index 31d70c201..e1a93283d 100644 --- a/include/osgDB/DotOsgWrapper +++ b/include/osgDB/DotOsgWrapper @@ -71,6 +71,6 @@ class OSGDB_EXPORT DotOsgWrapper : public osg::Referenced ReadWriteMode _readWriteMode; }; -}; +} #endif diff --git a/include/osgDB/DynamicLibrary b/include/osgDB/DynamicLibrary index cdedb45b2..963d5c04a 100644 --- a/include/osgDB/DynamicLibrary +++ b/include/osgDB/DynamicLibrary @@ -62,6 +62,6 @@ class OSGDB_EXPORT DynamicLibrary : public osg::Referenced }; -}; +} #endif // __DYNAMIC_LIBRARY_H diff --git a/include/osgDB/Field b/include/osgDB/Field index cf7321d5b..23857b24c 100644 --- a/include/osgDB/Field +++ b/include/osgDB/Field @@ -105,6 +105,6 @@ class OSGDB_EXPORT Field }; -}; +} #endif // __SG_FIELD_H diff --git a/include/osgDB/FieldReader b/include/osgDB/FieldReader index d1dc03265..c2becc8b4 100644 --- a/include/osgDB/FieldReader +++ b/include/osgDB/FieldReader @@ -57,6 +57,6 @@ class OSGDB_EXPORT FieldReader }; -}; +} #endif // __SG_FIELD_READER_H diff --git a/include/osgDB/FieldReaderIterator b/include/osgDB/FieldReaderIterator index 42ff6ea5f..ca5bdca41 100644 --- a/include/osgDB/FieldReaderIterator +++ b/include/osgDB/FieldReaderIterator @@ -67,6 +67,6 @@ class OSGDB_EXPORT FieldReaderIterator }; -}; +} #endif // __OSGDB_FIELD_READER_QUEUE_H diff --git a/include/osgDB/FileNameUtils b/include/osgDB/FileNameUtils index b27c4bd8b..713dce841 100644 --- a/include/osgDB/FileNameUtils +++ b/include/osgDB/FileNameUtils @@ -20,6 +20,6 @@ OSGDB_EXPORT extern std::string getStrippedName(const std::string& fileName); OSGDB_EXPORT extern bool equalCaseInsensitive(const std::string& lhs,const std::string& rhs); OSGDB_EXPORT extern bool equalCaseInsensitive(const std::string& lhs,const char* rhs); -}; +} #endif diff --git a/include/osgDB/FileUtils b/include/osgDB/FileUtils index 91ffd6853..4c34f98ed 100644 --- a/include/osgDB/FileUtils +++ b/include/osgDB/FileUtils @@ -48,6 +48,6 @@ OSGDB_EXPORT extern std::string findFileInDirectory(const std::string& fileName, OSGDB_EXPORT extern DirectoryContents getDirectoryContents(const std::string& dirName); -}; +} #endif diff --git a/include/osgDB/Input b/include/osgDB/Input index 3d440d349..1aa3f1819 100644 --- a/include/osgDB/Input +++ b/include/osgDB/Input @@ -47,6 +47,6 @@ class OSGDB_EXPORT Input : public FieldReaderIterator }; -}; +} #endif // __SG_INPUT_H diff --git a/include/osgDB/Output b/include/osgDB/Output index 5710c6183..8308b0974 100644 --- a/include/osgDB/Output +++ b/include/osgDB/Output @@ -115,7 +115,6 @@ bool writeArrayBlock(Output& fw,T* start,T* finish) return true; } - -}; +} #endif // __SG_OUTPUT_H diff --git a/include/osgDB/ReadFile b/include/osgDB/ReadFile index 9975d9e7b..5419c1821 100644 --- a/include/osgDB/ReadFile +++ b/include/osgDB/ReadFile @@ -42,6 +42,6 @@ OSGDB_EXPORT extern osg::Node* readNodeFile(const std::string& filename); * than one subgraph has been loaded.*/ OSGDB_EXPORT extern osg::Node* readNodeFiles(std::vector& commandLine); -}; +} #endif diff --git a/include/osgDB/ReaderWriter b/include/osgDB/ReaderWriter index f6916c088..8b31e5370 100644 --- a/include/osgDB/ReaderWriter +++ b/include/osgDB/ReaderWriter @@ -124,7 +124,6 @@ class OSGDB_EXPORT ReaderWriter : public osg::Referenced virtual WriteResult writeNode(const osg::Node& /*node*/,const std::string& /*fileName*/,const Options* =NULL) { return WriteResult(WriteResult::FILE_NOT_HANDLED); } }; - -}; +} #endif // OSG_READERWRITER diff --git a/include/osgDB/Registry b/include/osgDB/Registry index a358127db..c5567cc5b 100644 --- a/include/osgDB/Registry +++ b/include/osgDB/Registry @@ -198,6 +198,6 @@ class RegisterReaderWriterProxy osg::ref_ptr _rw; }; -}; +} #endif diff --git a/include/osgDB/Version b/include/osgDB/Version index 0cfb01b16..7eb0786f8 100644 --- a/include/osgDB/Version +++ b/include/osgDB/Version @@ -32,6 +32,6 @@ extern OSGDB_EXPORT const char* osgDBGetVersion(); */ extern OSGDB_EXPORT const char* osgDBGetLibraryName(); -}; +} #endif diff --git a/include/osgDB/WriteFile b/include/osgDB/WriteFile index 4ed707d8a..e1556ba57 100644 --- a/include/osgDB/WriteFile +++ b/include/osgDB/WriteFile @@ -40,6 +40,6 @@ OSGDB_EXPORT extern bool writeImageFile(const osg::Image& image, const std::stri OSGDB_EXPORT extern bool writeNodeFile(const osg::Node& node, const std::string& filename); -}; +} #endif diff --git a/include/osgGLUT/Version b/include/osgGLUT/Version index 03921bdd0..ba0fdddcb 100755 --- a/include/osgGLUT/Version +++ b/include/osgGLUT/Version @@ -33,7 +33,7 @@ extern OSGGLUT_EXPORT const char* osgGLUTGetVersion(); */ extern OSGGLUT_EXPORT const char* osgGLUTGetLibraryName(); -}; +} #endif diff --git a/include/osgGLUT/Window b/include/osgGLUT/Window index 53e0ce98c..541072da0 100644 --- a/include/osgGLUT/Window +++ b/include/osgGLUT/Window @@ -71,6 +71,6 @@ class OSGGLUT_EXPORT Window }; -}; +} #endif // SG_VIEWIER_H diff --git a/include/osgText/Font b/include/osgText/Font index d5df5cee5..4cd8b4241 100644 --- a/include/osgText/Font +++ b/include/osgText/Font @@ -251,7 +251,6 @@ protected: }; - -}; +} #endif // OSGTEXT_FONT diff --git a/include/osgText/Paragraph b/include/osgText/Paragraph index bb895eb3f..91dbce3a2 100644 --- a/include/osgText/Paragraph +++ b/include/osgText/Paragraph @@ -57,6 +57,6 @@ class OSGTEXT_EXPORT Paragraph : public osg::Geode }; -}; +} #endif diff --git a/include/osgText/Text b/include/osgText/Text index 3ad21035c..fe05def60 100644 --- a/include/osgText/Text +++ b/include/osgText/Text @@ -138,6 +138,6 @@ class OSGTEXT_EXPORT Text : public osg::Drawable osg::Vec3 _alignmentPos; }; -}; +} #endif // OSGTEXT_TEXT diff --git a/include/osgText/Version b/include/osgText/Version index 8bb9fc149..53006c759 100644 --- a/include/osgText/Version +++ b/include/osgText/Version @@ -32,6 +32,6 @@ extern OSGTEXT_EXPORT const char* osgTextGetVersion(); */ extern OSGTEXT_EXPORT const char* osgTextGetLibraryName(); -}; +} #endif diff --git a/include/osgUtil/AppVisitor b/include/osgUtil/AppVisitor index a447f5cba..e229568b7 100644 --- a/include/osgUtil/AppVisitor +++ b/include/osgUtil/AppVisitor @@ -65,7 +65,7 @@ class OSGUTIL_EXPORT AppVisitor : public osg::NodeVisitor }; -}; +} #endif diff --git a/include/osgUtil/CullViewState b/include/osgUtil/CullViewState index d4861a176..9cdfca5dc 100644 --- a/include/osgUtil/CullViewState +++ b/include/osgUtil/CullViewState @@ -82,8 +82,7 @@ class OSGUTIL_EXPORT CullViewState : public osg::Referenced }; - -}; +} #endif diff --git a/include/osgUtil/CullVisitor b/include/osgUtil/CullVisitor index 60648ad7e..4730ef661 100644 --- a/include/osgUtil/CullVisitor +++ b/include/osgUtil/CullVisitor @@ -404,7 +404,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor }; -}; +} #endif diff --git a/include/osgUtil/DepthSortedBin b/include/osgUtil/DepthSortedBin index bd565360e..7e282d7dd 100644 --- a/include/osgUtil/DepthSortedBin +++ b/include/osgUtil/DepthSortedBin @@ -45,7 +45,7 @@ class OSGUTIL_EXPORT DepthSortedBin : public RenderBin RenderLeafList _renderLeafList; }; -}; +} #endif diff --git a/include/osgUtil/DisplayListVisitor b/include/osgUtil/DisplayListVisitor index 9581098c9..1f55f8cbc 100644 --- a/include/osgUtil/DisplayListVisitor +++ b/include/osgUtil/DisplayListVisitor @@ -73,7 +73,7 @@ class OSGUTIL_EXPORT DisplayListVisitor : public osg::NodeVisitor }; -}; +} #endif diff --git a/include/osgUtil/DisplayRequirementsVisitor b/include/osgUtil/DisplayRequirementsVisitor index 5e2d886c1..a078f77c4 100644 --- a/include/osgUtil/DisplayRequirementsVisitor +++ b/include/osgUtil/DisplayRequirementsVisitor @@ -48,6 +48,6 @@ class OSGUTIL_EXPORT DisplayRequirementsVisitor : public osg::NodeVisitor }; -}; +} #endif diff --git a/include/osgUtil/GUIEventHandler b/include/osgUtil/GUIEventHandler index aaf522007..f7cd0701c 100644 --- a/include/osgUtil/GUIEventHandler +++ b/include/osgUtil/GUIEventHandler @@ -22,6 +22,6 @@ class OSGUTIL_EXPORT GUIEventHandler : public osg::Referenced }; -}; +} #endif diff --git a/include/osgUtil/InsertImpostorsVisitor b/include/osgUtil/InsertImpostorsVisitor index 635f2e133..a97b3e97b 100644 --- a/include/osgUtil/InsertImpostorsVisitor +++ b/include/osgUtil/InsertImpostorsVisitor @@ -56,6 +56,6 @@ class OSGUTIL_EXPORT InsertImpostorsVisitor : public osg::NodeVisitor }; -}; +} #endif diff --git a/include/osgUtil/IntersectVisitor b/include/osgUtil/IntersectVisitor index 78f99905d..7e9ea2de4 100644 --- a/include/osgUtil/IntersectVisitor +++ b/include/osgUtil/IntersectVisitor @@ -159,7 +159,7 @@ class OSGUTIL_EXPORT IntersectVisitor : public osg::NodeVisitor LineSegmentHitListMap _segHitList; }; -}; +} #endif diff --git a/include/osgUtil/Optimizer b/include/osgUtil/Optimizer index 22ddbabc5..faea2c65e 100644 --- a/include/osgUtil/Optimizer +++ b/include/osgUtil/Optimizer @@ -196,6 +196,6 @@ class OSGUTIL_EXPORT Optimizer }; -}; +} #endif diff --git a/include/osgUtil/RenderBin b/include/osgUtil/RenderBin index 86dec7f24..0218518d8 100644 --- a/include/osgUtil/RenderBin +++ b/include/osgUtil/RenderBin @@ -103,7 +103,7 @@ class RegisterRenderBinProxy }; -}; +} #endif diff --git a/include/osgUtil/RenderGraph b/include/osgUtil/RenderGraph index d6f2b74a1..26b63a772 100644 --- a/include/osgUtil/RenderGraph +++ b/include/osgUtil/RenderGraph @@ -196,7 +196,7 @@ class OSGUTIL_EXPORT RenderGraph : public osg::Referenced }; -}; +} #endif diff --git a/include/osgUtil/RenderLeaf b/include/osgUtil/RenderLeaf index c1afec528..5b8c88e2a 100644 --- a/include/osgUtil/RenderLeaf +++ b/include/osgUtil/RenderLeaf @@ -76,6 +76,6 @@ class OSGUTIL_EXPORT RenderLeaf : public osg::Referenced }; -}; +} #endif diff --git a/include/osgUtil/RenderStage b/include/osgUtil/RenderStage index 30e81ce3c..e1f83cb95 100644 --- a/include/osgUtil/RenderStage +++ b/include/osgUtil/RenderStage @@ -152,7 +152,7 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin }; -}; +} #endif diff --git a/include/osgUtil/RenderStageLighting b/include/osgUtil/RenderStageLighting index b971a5019..bafb68bd8 100644 --- a/include/osgUtil/RenderStageLighting +++ b/include/osgUtil/RenderStageLighting @@ -66,7 +66,7 @@ class OSGUTIL_EXPORT RenderStageLighting : public osg::Object }; -}; +} #endif diff --git a/include/osgUtil/RenderToTextureStage b/include/osgUtil/RenderToTextureStage index a7b8cdc27..9082bccad 100644 --- a/include/osgUtil/RenderToTextureStage +++ b/include/osgUtil/RenderToTextureStage @@ -45,7 +45,7 @@ class OSGUTIL_EXPORT RenderToTextureStage : public RenderStage }; -}; +} #endif diff --git a/include/osgUtil/SceneView b/include/osgUtil/SceneView index bbf9d5574..f70738c39 100644 --- a/include/osgUtil/SceneView +++ b/include/osgUtil/SceneView @@ -248,7 +248,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Referenced }; -}; +} #endif diff --git a/include/osgUtil/SmoothingVisitor b/include/osgUtil/SmoothingVisitor index 0cd8866d3..ff99fbac8 100644 --- a/include/osgUtil/SmoothingVisitor +++ b/include/osgUtil/SmoothingVisitor @@ -34,6 +34,6 @@ class OSGUTIL_EXPORT SmoothingVisitor : public osg::NodeVisitor }; -}; +} #endif diff --git a/include/osgUtil/Tesselator b/include/osgUtil/Tesselator index 2e3a86a30..deca804a7 100644 --- a/include/osgUtil/Tesselator +++ b/include/osgUtil/Tesselator @@ -113,6 +113,6 @@ class OSGUTIL_EXPORT Tesselator }; -}; +} #endif diff --git a/include/osgUtil/TransformCallback b/include/osgUtil/TransformCallback index b285cb2e3..671e2ff22 100644 --- a/include/osgUtil/TransformCallback +++ b/include/osgUtil/TransformCallback @@ -29,6 +29,6 @@ class OSGUTIL_EXPORT TransformCallback : public osg::NodeCallback }; -}; +} #endif diff --git a/include/osgUtil/TriStripVisitor b/include/osgUtil/TriStripVisitor index a365c2b2c..b00167817 100644 --- a/include/osgUtil/TriStripVisitor +++ b/include/osgUtil/TriStripVisitor @@ -37,6 +37,6 @@ class OSGUTIL_EXPORT TriStripVisitor : public osg::NodeVisitor }; -}; +} #endif diff --git a/include/osgUtil/Version b/include/osgUtil/Version index 2750ab978..bceb99932 100644 --- a/include/osgUtil/Version +++ b/include/osgUtil/Version @@ -33,7 +33,7 @@ extern OSGUTIL_EXPORT const char* osgUtilGetVersion(); */ extern OSGUTIL_EXPORT const char* osgUtilGetLibraryName(); -}; +} #endif diff --git a/include/osgWX/Version b/include/osgWX/Version index a900df5b1..a7bd917a6 100644 --- a/include/osgWX/Version +++ b/include/osgWX/Version @@ -33,7 +33,7 @@ extern OSGWX_EXPORT const char* osgWXGetVersion(); */ extern OSGWX_EXPORT const char* osgWXGetLibraryName(); -}; +} #endif