Hi Toben, I have merged your changes minus the #if #endif as #include<algorithm> is part of C++ itself so supported on all platforms, so there is no need to add extra code blocks that harm readability and maintainability. With this small tweak the changes and merged and submitted to svn/trunk and OSG-3.2 branch.
Cheers, Robert. On 22 November 2013 21:02, Torben Dannhauer <[email protected]> wrote: > Dear Robert, > > > > I’m working on the precompiled dependency package for Visual Studio 2013. > > > > Please find attached the modified src\osgPlugins\dxf\dxfEntity.cpp and > src\osgPlugins\txf\TXFFont.cpp files. > > In each I added the following conditional include to make the min() and > max() functions available: > > > > #if (_MSC_VER > 1700) > > #include <algorithm> > > #endif > > > > I would be happy to see it merged into trunk to make OSG compatible to the > newest VS release. > > > > Thanks, > > Torben > > > > > > > > > > _______________________________________________ > osg-submissions mailing list > [email protected] > > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > >
_______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
