From Norman Vine, fixes for Mingw

include/osg/ConvexPlanarOccluder

@@ -54,7 +54,7 @@ class SG_EXPORT ConvexPlanarOccluder : public Object
 
     protected:
 
-        ~ConvexPlanarOccluder() {}
+        ~ConvexPlanarOccluder(); // {}
 
         ConvexPlanarPolygon _occluder;
         HoleList _holeList;

include/osg/GLExtensions

@@ -19,7 +19,9 @@
 
 #if defined(WIN32)
     #define WIN32_LEAN_AND_MEAN
-    #define NOMINMAX
+    #ifndef NOMINMAX
+        #define NOMINMAX
+    #endif // NOMINMAX
     #include <windows.h>
 #elif defined(__APPLE__)
     #include <mach-o/dyld.h>

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;
 

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; }
 

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;
 

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.*/

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;