Removed the trailing ; after namespace {...} declariations in headers

which was being picked as a warning under Codewarrior.
This commit is contained in:
Robert Osfield
2002-02-03 12:33:41 +00:00
parent af968b00bd
commit c1283c23e8
106 changed files with 114 additions and 115 deletions

View File

@@ -78,6 +78,6 @@ class SG_EXPORT AlphaFunc : public StateAttribute
};
};
}
#endif

View File

@@ -106,6 +106,6 @@ class SG_EXPORT Billboard : public Geode
};
};
}
#endif

View File

@@ -141,6 +141,6 @@ class SG_EXPORT BoundingBox
}
};
};
}
#endif

View File

@@ -101,6 +101,6 @@ class SG_EXPORT BoundingSphere
};
};
}
#endif

View File

@@ -90,6 +90,6 @@ class SG_EXPORT ClipPlane : public StateAttribute
};
};
}
#endif

View File

@@ -177,5 +177,6 @@ class SG_EXPORT ClippingVolume
};
}; // end of namespace
} // end of namespace
#endif

View File

@@ -76,6 +76,6 @@ class SG_EXPORT ColorMask : public StateAttribute
};
};
}
#endif

View File

@@ -57,7 +57,7 @@ class SG_EXPORT ColorMatrix : public StateAttribute
};
};
}
#endif

View File

@@ -57,6 +57,6 @@ class SG_EXPORT CopyOp
CopyFlags _flags;
};
};
}
#endif

View File

@@ -64,6 +64,6 @@ class SG_EXPORT CullFace : public StateAttribute
};
};
}
#endif

View File

@@ -96,6 +96,6 @@ class SG_EXPORT Depth : public StateAttribute
};
};
}
#endif

View File

@@ -270,6 +270,6 @@ inline void Drawable::draw(State& state)
}
}
};
}
#endif

View File

@@ -54,6 +54,6 @@ class SG_EXPORT EarthSky : public Group
Vec4 _clearColor;
};
};
}
#endif

View File

@@ -87,6 +87,6 @@ class SG_EXPORT Fog : public StateAttribute
Vec4 _color;
};
};
}
#endif

View File

@@ -69,7 +69,7 @@ class SG_EXPORT FrameStamp : public Referenced
};
};
}
#endif

View File

@@ -56,6 +56,6 @@ class SG_EXPORT FrontFace : public StateAttribute
};
};
}
#endif

View File

@@ -20,6 +20,6 @@ SG_EXPORT extern const bool isGLExtensionSupported(const char *extension);
*/
SG_EXPORT extern void* getGLExtensionFuncPtr(const char *funcName);
};
}
#endif

View File

@@ -685,6 +685,6 @@ void for_each_triangle(GeoSet& gset,T& op)
};
};
}
#endif

View File

@@ -118,6 +118,6 @@ class SG_EXPORT Geode : public Node
};
};
}
#endif

View File

@@ -118,6 +118,6 @@ class SG_EXPORT Group : public Node
};
};
}
#endif

View File

@@ -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

View File

@@ -101,6 +101,6 @@ class SG_EXPORT Impostor : public LOD
};
};
}
#endif

View File

@@ -187,6 +187,6 @@ class SG_EXPORT ImpostorSpriteManager : public Referenced
};
};
}
#endif

View File

@@ -73,6 +73,6 @@ class SG_EXPORT LOD : public Group
};
};
}
#endif

View File

@@ -160,6 +160,6 @@ class SG_EXPORT Light : public StateAttribute
float _spot_cutoff; // spread
};
};
}
#endif

View File

@@ -42,6 +42,6 @@ class SG_EXPORT LightSource : public Node
ref_ptr<Light> _light;
};
};
}
#endif

View File

@@ -62,6 +62,6 @@ class SG_EXPORT LineSegment : public Referenced
Vec3 _e;
};
};
}
#endif

View File

@@ -50,6 +50,6 @@ class SG_EXPORT LineWidth : public StateAttribute
};
};
}
#endif

View File

@@ -164,6 +164,6 @@ class SG_EXPORT Material : public StateAttribute
};
};
}
#endif

View File

@@ -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

View File

@@ -288,7 +288,7 @@ inline std::ostream& operator<< (std::ostream& os, const Matrix& m )
}
}; //namespace osg
} //namespace osg
#endif

View File

@@ -36,6 +36,6 @@ class SG_EXPORT MemoryAdapter : public Referenced
virtual ~MemoryAdapter() {}
};
};
}
#endif

View File

@@ -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<Node*> NodePath;
};
}
#endif

View File

@@ -85,7 +85,7 @@ class SG_EXPORT NodeCallback : public Referenced {
ref_ptr<NodeCallback> _nestedCallback;
};
}; // namespace
} // namespace
#endif

View File

@@ -171,6 +171,6 @@ struct NodeAcceptOp
void operator () (ref_ptr<Node> node) { node->accept(_nv); }
};
};
}
#endif

View File

@@ -82,6 +82,6 @@ inline std::ostream& notify(const NotifySeverity severity)
inline std::ostream& notify(void) { return notify(osg::INFO); }
};
}
#endif

View File

@@ -71,6 +71,6 @@ class SG_EXPORT Object : public Referenced
Object& operator = (const Object&) { return *this; }
};
};
}
#endif

View File

@@ -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

View File

@@ -70,6 +70,6 @@ class SG_EXPORT Point : public StateAttribute
};
};
}
#endif

View File

@@ -72,6 +72,6 @@ class SG_EXPORT PolygonMode : public StateAttribute
};
};
}
#endif

View File

@@ -63,6 +63,6 @@ class SG_EXPORT PolygonOffset : public StateAttribute
};
};
}
#endif

View File

@@ -48,6 +48,6 @@ class SG_EXPORT PositionAttitudeTransform : public Transform
};
};
}
#endif

View File

@@ -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

View File

@@ -37,6 +37,6 @@ class SG_EXPORT Referenced
};
};
}
#endif

View File

@@ -59,6 +59,6 @@ class SG_EXPORT ShadeModel : public StateAttribute
};
};
}
#endif

View File

@@ -214,6 +214,6 @@ class SG_EXPORT State : public Referenced
};
};
}
#endif

View File

@@ -199,6 +199,6 @@ class SG_EXPORT StateAttribute : public Object
};
};
}
#endif

View File

@@ -171,6 +171,6 @@ class SG_EXPORT StateSet : public Object
};
};
}
#endif

View File

@@ -110,6 +110,6 @@ public:
};
};
}
#endif

View File

@@ -141,6 +141,6 @@ class SG_EXPORT Stencil : public StateAttribute
};
};
}
#endif

View File

@@ -59,6 +59,6 @@ class SG_EXPORT Switch : public Group
int _value;
};
};
}
#endif

View File

@@ -58,6 +58,6 @@ class SG_EXPORT TexEnv : public StateAttribute
Mode _mode;
};
};
}
#endif

View File

@@ -97,6 +97,6 @@ class SG_EXPORT TexGen : public StateAttribute
};
};
}
#endif

View File

@@ -57,7 +57,7 @@ class SG_EXPORT TexMat : public StateAttribute
};
};
}
#endif

View File

@@ -322,6 +322,6 @@ class SG_EXPORT Texture : public StateAttribute
};
};
}
#endif

View File

@@ -59,7 +59,7 @@ class SG_EXPORT Timer {
};
};
}
#if defined(_WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__))
#include <time.h>
@@ -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

View File

@@ -117,6 +117,6 @@ class SG_EXPORT Transform : public Group
mutable ref_ptr<Matrix> _worldToLocal;
};
};
}
#endif

View File

@@ -80,6 +80,6 @@ class SG_EXPORT Transparency : public StateAttribute
int _destination_factor;
};
};
}
#endif

View File

@@ -12,6 +12,6 @@ typedef unsigned short ushort;
typedef unsigned char uchar;
typedef uchar ubyte;
};
}
#endif

View File

@@ -32,6 +32,6 @@ extern SG_EXPORT const char* osgGetVersion();
*/
extern SG_EXPORT const char* osgGetLibraryName();
};
}
#endif

View File

@@ -86,6 +86,6 @@ class SG_EXPORT Viewport : public StateAttribute
};
};
}
#endif

View File

@@ -201,6 +201,6 @@ class mem_ptr
// };
};
}
#endif

View File

@@ -99,6 +99,6 @@ class ref_ptr
T* _ptr;
};
};
}
#endif

View File

@@ -71,6 +71,6 @@ class OSGDB_EXPORT DotOsgWrapper : public osg::Referenced
ReadWriteMode _readWriteMode;
};
};
}
#endif

View File

@@ -62,6 +62,6 @@ class OSGDB_EXPORT DynamicLibrary : public osg::Referenced
};
};
}
#endif // __DYNAMIC_LIBRARY_H

View File

@@ -105,6 +105,6 @@ class OSGDB_EXPORT Field
};
};
}
#endif // __SG_FIELD_H

View File

@@ -57,6 +57,6 @@ class OSGDB_EXPORT FieldReader
};
};
}
#endif // __SG_FIELD_READER_H

View File

@@ -67,6 +67,6 @@ class OSGDB_EXPORT FieldReaderIterator
};
};
}
#endif // __OSGDB_FIELD_READER_QUEUE_H

View File

@@ -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

View File

@@ -48,6 +48,6 @@ OSGDB_EXPORT extern std::string findFileInDirectory(const std::string& fileName,
OSGDB_EXPORT extern DirectoryContents getDirectoryContents(const std::string& dirName);
};
}
#endif

View File

@@ -47,6 +47,6 @@ class OSGDB_EXPORT Input : public FieldReaderIterator
};
};
}
#endif // __SG_INPUT_H

View File

@@ -115,7 +115,6 @@ bool writeArrayBlock(Output& fw,T* start,T* finish)
return true;
}
};
}
#endif // __SG_OUTPUT_H

View File

@@ -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<std::string>& commandLine);
};
}
#endif

View File

@@ -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

View File

@@ -198,6 +198,6 @@ class RegisterReaderWriterProxy
osg::ref_ptr<T> _rw;
};
};
}
#endif

View File

@@ -32,6 +32,6 @@ extern OSGDB_EXPORT const char* osgDBGetVersion();
*/
extern OSGDB_EXPORT const char* osgDBGetLibraryName();
};
}
#endif

View File

@@ -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

View File

@@ -33,7 +33,7 @@ extern OSGGLUT_EXPORT const char* osgGLUTGetVersion();
*/
extern OSGGLUT_EXPORT const char* osgGLUTGetLibraryName();
};
}
#endif

View File

@@ -71,6 +71,6 @@ class OSGGLUT_EXPORT Window
};
};
}
#endif // SG_VIEWIER_H

View File

@@ -251,7 +251,6 @@ protected:
};
};
}
#endif // OSGTEXT_FONT

View File

@@ -57,6 +57,6 @@ class OSGTEXT_EXPORT Paragraph : public osg::Geode
};
};
}
#endif

View File

@@ -138,6 +138,6 @@ class OSGTEXT_EXPORT Text : public osg::Drawable
osg::Vec3 _alignmentPos;
};
};
}
#endif // OSGTEXT_TEXT

View File

@@ -32,6 +32,6 @@ extern OSGTEXT_EXPORT const char* osgTextGetVersion();
*/
extern OSGTEXT_EXPORT const char* osgTextGetLibraryName();
};
}
#endif

View File

@@ -65,7 +65,7 @@ class OSGUTIL_EXPORT AppVisitor : public osg::NodeVisitor
};
};
}
#endif

View File

@@ -82,8 +82,7 @@ class OSGUTIL_EXPORT CullViewState : public osg::Referenced
};
};
}
#endif

View File

@@ -404,7 +404,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor
};
};
}
#endif

View File

@@ -45,7 +45,7 @@ class OSGUTIL_EXPORT DepthSortedBin : public RenderBin
RenderLeafList _renderLeafList;
};
};
}
#endif

View File

@@ -73,7 +73,7 @@ class OSGUTIL_EXPORT DisplayListVisitor : public osg::NodeVisitor
};
};
}
#endif

View File

@@ -48,6 +48,6 @@ class OSGUTIL_EXPORT DisplayRequirementsVisitor : public osg::NodeVisitor
};
};
}
#endif

View File

@@ -22,6 +22,6 @@ class OSGUTIL_EXPORT GUIEventHandler : public osg::Referenced
};
};
}
#endif

View File

@@ -56,6 +56,6 @@ class OSGUTIL_EXPORT InsertImpostorsVisitor : public osg::NodeVisitor
};
};
}
#endif

View File

@@ -159,7 +159,7 @@ class OSGUTIL_EXPORT IntersectVisitor : public osg::NodeVisitor
LineSegmentHitListMap _segHitList;
};
};
}
#endif

View File

@@ -196,6 +196,6 @@ class OSGUTIL_EXPORT Optimizer
};
};
}
#endif

View File

@@ -103,7 +103,7 @@ class RegisterRenderBinProxy
};
};
}
#endif

View File

@@ -196,7 +196,7 @@ class OSGUTIL_EXPORT RenderGraph : public osg::Referenced
};
};
}
#endif

View File

@@ -76,6 +76,6 @@ class OSGUTIL_EXPORT RenderLeaf : public osg::Referenced
};
};
}
#endif

View File

@@ -152,7 +152,7 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
};
};
}
#endif

View File

@@ -66,7 +66,7 @@ class OSGUTIL_EXPORT RenderStageLighting : public osg::Object
};
};
}
#endif

View File

@@ -45,7 +45,7 @@ class OSGUTIL_EXPORT RenderToTextureStage : public RenderStage
};
};
}
#endif

View File

@@ -248,7 +248,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Referenced
};
};
}
#endif

Some files were not shown because too many files have changed in this diff Show More