Changeset 3212

Show
Ignore:
Timestamp:
08/02/04 11:11:31 (10 years ago)
Author:
robert
Message:

From Norman Vine, fixes for Mingw

Location:
OpenSceneGraph/trunk
Files:
2 added
23 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/VisualStudio/osgDB/osgDB.dsp

    r3181 r3212  
    140140# Begin Source File 
    141141 
     142SOURCE=..\..\Src\osgDB\ReaderWriter.cpp 
     143# End Source File 
     144# Begin Source File 
     145 
    142146SOURCE=..\..\Src\osgDB\ReadFile.cpp 
    143147# End Source File 
  • OpenSceneGraph/trunk/VisualStudio/osgGA/osgGA.dsp

    r3205 r3212  
    108108# Begin Source File 
    109109 
     110SOURCE=..\..\src\osgGA\GUIEventAdapter.cpp 
     111# End Source File 
     112# Begin Source File 
     113 
    110114SOURCE=..\..\src\osgGA\GUIEventHandler.cpp 
    111115# End Source File 
  • OpenSceneGraph/trunk/include/osg/ConvexPlanarOccluder

    r1920 r3212  
    5555    protected: 
    5656 
    57         ~ConvexPlanarOccluder() {} 
     57        ~ConvexPlanarOccluder(); // {} 
    5858 
    5959        ConvexPlanarPolygon _occluder; 
  • OpenSceneGraph/trunk/include/osg/GLExtensions

    r2973 r3212  
    2020#if defined(WIN32) 
    2121    #define WIN32_LEAN_AND_MEAN 
    22     #define NOMINMAX 
     22    #ifndef NOMINMAX 
     23        #define NOMINMAX 
     24    #endif // NOMINMAX 
    2325    #include <windows.h> 
    2426#elif defined(__APPLE__) 
  • OpenSceneGraph/trunk/include/osg/Shape

    r2767 r3212  
    8383    protected: 
    8484     
    85         virtual ~Shape() {} 
     85        virtual ~Shape(); 
    8686}; 
    8787 
     
    572572    protected: 
    573573     
    574         ~HeightField() {} 
     574        virtual ~HeightField(); 
    575575 
    576576        unsigned int    _columns,_rows; 
  • OpenSceneGraph/trunk/include/osgDB/ReaderWriter

    r2962 r3212  
    3232{ 
    3333    public: 
    34         virtual ~ReaderWriter() {} 
     34        virtual ~ReaderWriter(); // {} 
    3535        virtual const char* className() = 0; 
    3636        virtual bool acceptsExtension(const std::string& /*extension*/) { return false; } 
  • OpenSceneGraph/trunk/include/osgGA/GUIEventAdapter

    r1939 r3212  
    293293 
    294294        /** Force users to create on heap, so that multiple referencing is safe.*/ 
    295         virtual ~GUIEventAdapter() {} 
     295        virtual ~GUIEventAdapter(); // {} 
    296296 
    297297        MouseYOrientation _mouseYOrientation; 
  • OpenSceneGraph/trunk/include/osgProducer/OsgCameraGroup

    r3179 r3212  
    136136             
    137137        protected: 
    138             virtual ~RealizeCallback() {} 
     138            virtual ~RealizeCallback(); // {} 
    139139        }; 
    140140 
  • OpenSceneGraph/trunk/include/osgSim/ScalarBar

    r3023 r3212  
    225225    void update() { createDrawables(); } 
    226226 
    227 private: 
     227protected: 
     228    virtual ~ScalarBar(); 
    228229 
    229230    int _numColors; 
  • OpenSceneGraph/trunk/src/osg/ConvexPlanarOccluder.cpp

    r1529 r3212  
    1414 
    1515using namespace osg; 
     16 
     17ConvexPlanarOccluder::~ConvexPlanarOccluder() 
     18{ 
     19}; 
  • OpenSceneGraph/trunk/src/osg/Shape.cpp

    r2398 r3212  
    1515 
    1616using namespace osg; 
     17 
     18Shape::~Shape() 
     19{ 
     20} 
     21 
     22HeightField::~HeightField() 
     23{ 
     24} 
     25 
    1726 
    1827void HeightField::allocate(unsigned int numColumns,unsigned int numRows) 
  • OpenSceneGraph/trunk/src/osgDB/GNUmakefile

    r2631 r3212  
    88        FileUtils.cpp\ 
    99        ReadFile.cpp\ 
     10        ReaderWriter.cpp\ 
    1011        Registry.cpp\ 
    1112        Version.cpp\ 
  • OpenSceneGraph/trunk/src/osgGA/DriveManipulator.cpp

    r3147 r3212  
     1/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield  
     2 * 
     3 * This library is open source and may be redistributed and/or modified under   
     4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or  
     5 * (at your option) any later version.  The full license is in LICENSE file 
     6 * included with this distribution, and on the openscenegraph.org website. 
     7 *  
     8 * This library is distributed in the hope that it will be useful, 
     9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     11 * OpenSceneGraph Public License for more details. 
     12*/ 
     13 
    114#if defined(_MSC_VER) 
    215        #pragma warning( disable : 4786 ) 
  • OpenSceneGraph/trunk/src/osgGA/GNUmakefile

    r3205 r3212  
    88        DriveManipulator.cpp\ 
    99        FlightManipulator.cpp\ 
     10        GUIEventAdapter.cpp\ 
    1011        GUIEventHandler.cpp\ 
    1112        GUIEventHandlerVisitor.cpp\ 
  • OpenSceneGraph/trunk/src/osgGA/GUIEventHandler.cpp

    r1614 r3212  
     1/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield  
     2 * 
     3 * This library is open source and may be redistributed and/or modified under   
     4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or  
     5 * (at your option) any later version.  The full license is in LICENSE file 
     6 * included with this distribution, and on the openscenegraph.org website. 
     7 *  
     8 * This library is distributed in the hope that it will be useful, 
     9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     11 * OpenSceneGraph Public License for more details. 
     12*/ 
     13 
    114#include <osgGA/GUIEventHandler> 
    215 
  • OpenSceneGraph/trunk/src/osgPlugins/flt/AttrData.h

    r2777 r3212  
    22#define __ATTR_DATA_H 
    33 
    4 #if defined(WIN32) && !defined(__CYGWIN__) 
     4#if defined(_MSC_VER) 
    55#pragma warning( disable : 4786 ) 
    66#endif 
  • OpenSceneGraph/trunk/src/osgPlugins/flt/GeoSetBuilder.cpp

    r2777 r3212  
    55// Julian Ortiz, June 18th 2003. 
    66 
    7 #if defined(WIN32) && !defined(__CYGWIN__) 
     7#if defined(_MSC_VER) 
    88#pragma warning( disable : 4786 ) 
    99#endif 
  • OpenSceneGraph/trunk/src/osgPlugins/flt/MeshPrimitiveRecord.cpp

    r1040 r3212  
    11// MeshPrimitiveRecords.cpp 
    22 
    3 #ifdef _WIN32 
     3#if defined(_MSC_VER) 
    44#pragma warning(disable:4786) // Truncated debug names. 
    55#endif 
  • OpenSceneGraph/trunk/src/osgPlugins/flt/MeshRecord.cpp

    r1040 r3212  
    11// MeshRecord.cpp 
    22 
    3 #ifdef _WIN32 
     3#if defined(_MSC_VER) 
    44#pragma warning(disable:4786) // Truncated debug names. 
    55#endif 
  • OpenSceneGraph/trunk/src/osgPlugins/flt/Registry.h

    r1990 r3212  
    55#define __FLT_REGISTRY_H 
    66 
    7 #if defined(WIN32) && !defined(__CYGWIN__) 
     7#if defined(_MSC_VER) 
    88#pragma warning( disable : 4786 ) 
    99#endif 
  • OpenSceneGraph/trunk/src/osgPlugins/flt/flt.h

    r1990 r3212  
    1212#include <assert.h> 
    1313 
    14 #if defined(__CYGWIN__) || defined(__MINGW32__) 
     14#if defined(_MSC_VER) 
    1515#include <sys/types.h> 
    1616#endif 
  • OpenSceneGraph/trunk/src/osgProducer/OsgCameraGroup.cpp

    r3179 r3212  
    2727using namespace osgProducer; 
    2828 
     29OsgCameraGroup::RealizeCallback::~RealizeCallback() 
     30{ 
     31} 
    2932 
    3033class RenderSurfaceRealizeCallback : public Producer::RenderSurface::Callback 
  • OpenSceneGraph/trunk/src/osgSim/ScalarBar.cpp

    r3029 r3212  
    55 
    66using namespace osgSim; 
     7 
     8ScalarBar::~ScalarBar() 
     9{ 
     10} 
    711 
    812std::string ScalarBar::ScalarPrinter::printScalar(float scalar)