Date: Mon, 17 Jul 2017 12:25:10 +0000 (UTC) From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446068 - in head/devel/simgear: . files Message-ID: <201707171225.v6HCPAp2037252@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: martymac Date: Mon Jul 17 12:25:09 2017 New Revision: 446068 URL: https://svnweb.freebsd.org/changeset/ports/446068 Log: Remove tr1 dependency to prepare for Boost 1.65 PR: 220718 Submitted by: jbeich Added: head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx (contents, props changed) head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx (contents, props changed) Modified: head/devel/simgear/Makefile Modified: head/devel/simgear/Makefile ============================================================================== --- head/devel/simgear/Makefile Mon Jul 17 11:56:51 2017 (r446067) +++ head/devel/simgear/Makefile Mon Jul 17 12:25:09 2017 (r446068) @@ -2,7 +2,7 @@ PORTNAME= simgear PORTVERSION= 2017.1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} Added: head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx Mon Jul 17 12:25:09 2017 (r446068) @@ -0,0 +1,27 @@ +--- simgear/scene/material/Effect.cxx.orig 2017-04-04 09:24:44.000000000 +0200 ++++ simgear/scene/material/Effect.cxx 2017-07-16 21:55:10.888904000 +0200 +@@ -32,7 +32,7 @@ + #include <map> + #include <queue> + #include <utility> +-#include <boost/tr1/unordered_map.hpp> ++#include <unordered_map> + + #include <boost/bind.hpp> + #include <boost/foreach.hpp> +@@ -832,13 +832,13 @@ + + // XXX Should these be protected by a mutex? Probably + +-typedef tr1::unordered_map<ProgramKey, ref_ptr<Program>, ++typedef std::unordered_map<ProgramKey, ref_ptr<Program>, + boost::hash<ProgramKey>, ProgramKey::EqualTo> + ProgramMap; + ProgramMap programMap; + ProgramMap resolvedProgramMap; // map with resolved shader file names + +-typedef tr1::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> > ++typedef std::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> > + ShaderMap; + ShaderMap shaderMap; + Added: head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx Mon Jul 17 12:25:09 2017 (r446068) @@ -0,0 +1,20 @@ +--- simgear/scene/material/Effect.hxx.orig 2017-04-04 09:24:44.000000000 +0200 ++++ simgear/scene/material/Effect.hxx 2017-07-16 21:55:33.247324000 +0200 +@@ -19,7 +19,7 @@ + + #include <vector> + #include <string> +-#include <boost/tr1/unordered_map.hpp> ++#include <unordered_map> + + #include <boost/functional/hash.hpp> + +@@ -127,7 +127,7 @@ + bool operator()(const Key& lhs, const Key& rhs) const; + }; + }; +- typedef std::tr1::unordered_map<Key, osg::observer_ptr<Effect>, ++ typedef std::unordered_map<Key, osg::observer_ptr<Effect>, + boost::hash<Key>, Key::EqualTo> Cache; + Cache* getCache() + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707171225.v6HCPAp2037252>