diff --git a/VisualStudio/osgDB/osgDB.dsp b/VisualStudio/osgDB/osgDB.dsp index b0f845316..39139f1de 100755 --- a/VisualStudio/osgDB/osgDB.dsp +++ b/VisualStudio/osgDB/osgDB.dsp @@ -139,6 +139,10 @@ SOURCE=..\..\Src\osgDB\Output.cpp # End Source File # Begin Source File +SOURCE=..\..\Src\osgDB\ReaderWriter.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Src\osgDB\ReadFile.cpp # End Source File # Begin Source File diff --git a/VisualStudio/osgGA/osgGA.dsp b/VisualStudio/osgGA/osgGA.dsp index 58fcc5650..7ee706649 100755 --- a/VisualStudio/osgGA/osgGA.dsp +++ b/VisualStudio/osgGA/osgGA.dsp @@ -107,6 +107,10 @@ SOURCE=..\..\src\osgGA\FlightManipulator.cpp # End Source File # Begin Source File +SOURCE=..\..\src\osgGA\GUIEventAdapter.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\osgGA\GUIEventHandler.cpp # End Source File # Begin Source File diff --git a/include/osg/ConvexPlanarOccluder b/include/osg/ConvexPlanarOccluder index 4bd75a6f4..8fdb9c3b2 100644 --- a/include/osg/ConvexPlanarOccluder +++ b/include/osg/ConvexPlanarOccluder @@ -54,7 +54,7 @@ class SG_EXPORT ConvexPlanarOccluder : public Object protected: - ~ConvexPlanarOccluder() {} + ~ConvexPlanarOccluder(); // {} ConvexPlanarPolygon _occluder; HoleList _holeList; diff --git a/include/osg/GLExtensions b/include/osg/GLExtensions index 46e4e95b6..14bfe7add 100644 --- a/include/osg/GLExtensions +++ b/include/osg/GLExtensions @@ -19,7 +19,9 @@ #if defined(WIN32) #define WIN32_LEAN_AND_MEAN - #define NOMINMAX + #ifndef NOMINMAX + #define NOMINMAX + #endif // NOMINMAX #include #elif defined(__APPLE__) #include diff --git a/include/osg/Shape b/include/osg/Shape index 7271ee2f5..71be534b0 100644 --- a/include/osg/Shape +++ b/include/osg/Shape @@ -82,7 +82,7 @@ class SG_EXPORT Shape : public Object protected: - virtual ~Shape() {} + virtual ~Shape(); }; // forward declartions of Shape types. @@ -571,7 +571,7 @@ class SG_EXPORT HeightField : public Shape protected: - ~HeightField() {} + virtual ~HeightField(); unsigned int _columns,_rows; diff --git a/include/osgDB/ReaderWriter b/include/osgDB/ReaderWriter index 90fb5f296..f3d858310 100644 --- a/include/osgDB/ReaderWriter +++ b/include/osgDB/ReaderWriter @@ -31,7 +31,7 @@ namespace osgDB { class OSGDB_EXPORT ReaderWriter : public osg::Referenced { public: - virtual ~ReaderWriter() {} + virtual ~ReaderWriter(); // {} virtual const char* className() = 0; virtual bool acceptsExtension(const std::string& /*extension*/) { return false; } diff --git a/include/osgGA/GUIEventAdapter b/include/osgGA/GUIEventAdapter index ee27a0043..e04c01cfa 100644 --- a/include/osgGA/GUIEventAdapter +++ b/include/osgGA/GUIEventAdapter @@ -292,7 +292,7 @@ protected: GUIEventAdapter(MouseYOrientation myo=Y_INCREASING_DOWNWARDS):_mouseYOrientation(myo) {} /** Force users to create on heap, so that multiple referencing is safe.*/ - virtual ~GUIEventAdapter() {} + virtual ~GUIEventAdapter(); // {} MouseYOrientation _mouseYOrientation; diff --git a/include/osgProducer/OsgCameraGroup b/include/osgProducer/OsgCameraGroup index b54dfdacb..db3b982cd 100644 --- a/include/osgProducer/OsgCameraGroup +++ b/include/osgProducer/OsgCameraGroup @@ -135,7 +135,7 @@ class OSGPRODUCER_EXPORT OsgCameraGroup : public Producer::CameraGroup virtual void operator()( OsgCameraGroup& cg, OsgSceneHandler& sh, const Producer::RenderSurface & rs) = 0; protected: - virtual ~RealizeCallback() {} + virtual ~RealizeCallback(); // {} }; /** Set the realize callback to use when once the render surfaces are realized.*/ diff --git a/include/osgSim/ScalarBar b/include/osgSim/ScalarBar index f8835232a..72827db0a 100644 --- a/include/osgSim/ScalarBar +++ b/include/osgSim/ScalarBar @@ -224,7 +224,8 @@ public: /** force update the drawables used to render the scalar bar.*/ void update() { createDrawables(); } -private: +protected: + virtual ~ScalarBar(); int _numColors; int _numLabels; diff --git a/src/osg/ConvexPlanarOccluder.cpp b/src/osg/ConvexPlanarOccluder.cpp index af5ce3f88..c234c01ad 100644 --- a/src/osg/ConvexPlanarOccluder.cpp +++ b/src/osg/ConvexPlanarOccluder.cpp @@ -13,3 +13,7 @@ #include using namespace osg; + +ConvexPlanarOccluder::~ConvexPlanarOccluder() +{ +}; diff --git a/src/osg/Shape.cpp b/src/osg/Shape.cpp index dcd03c82a..32395c169 100644 --- a/src/osg/Shape.cpp +++ b/src/osg/Shape.cpp @@ -15,6 +15,15 @@ using namespace osg; +Shape::~Shape() +{ +} + +HeightField::~HeightField() +{ +} + + void HeightField::allocate(unsigned int numColumns,unsigned int numRows) { if (_columns!=numColumns || _rows!=numRows) diff --git a/src/osgDB/GNUmakefile b/src/osgDB/GNUmakefile index 17475dab3..f2ecdae3c 100644 --- a/src/osgDB/GNUmakefile +++ b/src/osgDB/GNUmakefile @@ -7,6 +7,7 @@ CXXFILES =\ FileNameUtils.cpp\ FileUtils.cpp\ ReadFile.cpp\ + ReaderWriter.cpp\ Registry.cpp\ Version.cpp\ WriteFile.cpp\ diff --git a/src/osgDB/ReaderWriter.cpp b/src/osgDB/ReaderWriter.cpp new file mode 100644 index 000000000..ecf2f8fe0 --- /dev/null +++ b/src/osgDB/ReaderWriter.cpp @@ -0,0 +1,20 @@ +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield + * + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * OpenSceneGraph Public License for more details. +*/ + +#include + +using namespace osgDB; + +ReaderWriter::~ReaderWriter() +{ +} diff --git a/src/osgGA/DriveManipulator.cpp b/src/osgGA/DriveManipulator.cpp index d825c5679..b3416e514 100644 --- a/src/osgGA/DriveManipulator.cpp +++ b/src/osgGA/DriveManipulator.cpp @@ -1,3 +1,16 @@ +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield + * + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * OpenSceneGraph Public License for more details. +*/ + #if defined(_MSC_VER) #pragma warning( disable : 4786 ) #endif diff --git a/src/osgGA/GNUmakefile b/src/osgGA/GNUmakefile index 661043a04..08d29e302 100644 --- a/src/osgGA/GNUmakefile +++ b/src/osgGA/GNUmakefile @@ -7,6 +7,7 @@ CXXFILES = \ MatrixManipulator.cpp\ DriveManipulator.cpp\ FlightManipulator.cpp\ + GUIEventAdapter.cpp\ GUIEventHandler.cpp\ GUIEventHandlerVisitor.cpp\ KeySwitchMatrixManipulator.cpp\ diff --git a/src/osgGA/GUIEventAdapter.cpp b/src/osgGA/GUIEventAdapter.cpp new file mode 100644 index 000000000..0832c66f6 --- /dev/null +++ b/src/osgGA/GUIEventAdapter.cpp @@ -0,0 +1,20 @@ +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield + * + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * OpenSceneGraph Public License for more details. +*/ + +#include + +using namespace osgGA; + +GUIEventAdapter::~GUIEventAdapter() +{ +} diff --git a/src/osgGA/GUIEventHandler.cpp b/src/osgGA/GUIEventHandler.cpp index c59d151bb..9df41adae 100644 --- a/src/osgGA/GUIEventHandler.cpp +++ b/src/osgGA/GUIEventHandler.cpp @@ -1,3 +1,16 @@ +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield + * + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * OpenSceneGraph Public License for more details. +*/ + #include using namespace osgGA; diff --git a/src/osgPlugins/flt/AttrData.h b/src/osgPlugins/flt/AttrData.h index 39a01fc99..3ffef7c46 100644 --- a/src/osgPlugins/flt/AttrData.h +++ b/src/osgPlugins/flt/AttrData.h @@ -1,7 +1,7 @@ #ifndef __ATTR_DATA_H #define __ATTR_DATA_H -#if defined(WIN32) && !defined(__CYGWIN__) +#if defined(_MSC_VER) #pragma warning( disable : 4786 ) #endif diff --git a/src/osgPlugins/flt/GeoSetBuilder.cpp b/src/osgPlugins/flt/GeoSetBuilder.cpp index f2ca3644e..9632b0a31 100644 --- a/src/osgPlugins/flt/GeoSetBuilder.cpp +++ b/src/osgPlugins/flt/GeoSetBuilder.cpp @@ -4,7 +4,7 @@ // that is used to detail texture // Julian Ortiz, June 18th 2003. -#if defined(WIN32) && !defined(__CYGWIN__) +#if defined(_MSC_VER) #pragma warning( disable : 4786 ) #endif diff --git a/src/osgPlugins/flt/MeshPrimitiveRecord.cpp b/src/osgPlugins/flt/MeshPrimitiveRecord.cpp index a7ca889de..36475325f 100644 --- a/src/osgPlugins/flt/MeshPrimitiveRecord.cpp +++ b/src/osgPlugins/flt/MeshPrimitiveRecord.cpp @@ -1,6 +1,6 @@ // MeshPrimitiveRecords.cpp -#ifdef _WIN32 +#if defined(_MSC_VER) #pragma warning(disable:4786) // Truncated debug names. #endif diff --git a/src/osgPlugins/flt/MeshRecord.cpp b/src/osgPlugins/flt/MeshRecord.cpp index 1d38d1409..82000119e 100644 --- a/src/osgPlugins/flt/MeshRecord.cpp +++ b/src/osgPlugins/flt/MeshRecord.cpp @@ -1,6 +1,6 @@ // MeshRecord.cpp -#ifdef _WIN32 +#if defined(_MSC_VER) #pragma warning(disable:4786) // Truncated debug names. #endif diff --git a/src/osgPlugins/flt/Registry.h b/src/osgPlugins/flt/Registry.h index d27caf873..e11c2db37 100644 --- a/src/osgPlugins/flt/Registry.h +++ b/src/osgPlugins/flt/Registry.h @@ -4,7 +4,7 @@ #ifndef __FLT_REGISTRY_H #define __FLT_REGISTRY_H -#if defined(WIN32) && !defined(__CYGWIN__) +#if defined(_MSC_VER) #pragma warning( disable : 4786 ) #endif diff --git a/src/osgPlugins/flt/flt.h b/src/osgPlugins/flt/flt.h index 170cf785b..f929bc377 100644 --- a/src/osgPlugins/flt/flt.h +++ b/src/osgPlugins/flt/flt.h @@ -11,7 +11,7 @@ #include #include -#if defined(__CYGWIN__) || defined(__MINGW32__) +#if defined(_MSC_VER) #include #endif diff --git a/src/osgProducer/OsgCameraGroup.cpp b/src/osgProducer/OsgCameraGroup.cpp index b94f76fe7..520600e04 100644 --- a/src/osgProducer/OsgCameraGroup.cpp +++ b/src/osgProducer/OsgCameraGroup.cpp @@ -26,6 +26,9 @@ using namespace Producer; using namespace osgProducer; +OsgCameraGroup::RealizeCallback::~RealizeCallback() +{ +} class RenderSurfaceRealizeCallback : public Producer::RenderSurface::Callback { diff --git a/src/osgSim/ScalarBar.cpp b/src/osgSim/ScalarBar.cpp index 599622246..1c1264caa 100644 --- a/src/osgSim/ScalarBar.cpp +++ b/src/osgSim/ScalarBar.cpp @@ -5,6 +5,10 @@ using namespace osgSim; +ScalarBar::~ScalarBar() +{ +} + std::string ScalarBar::ScalarPrinter::printScalar(float scalar) { std::stringstream ostr;