Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-games/simgear/files: simgear-2.4.0-boost148.patch
Date: Mon, 09 Jul 2012 15:08:42
Message-Id: 20120709150817.E99FC20065@flycatcher.gentoo.org
1 xmw 12/07/09 15:08:17
2
3 Added: simgear-2.4.0-boost148.patch
4 Log:
5 Fix boost-1.48 compilation issue (bug 407433, c bou)
6
7 (Portage version: 2.1.11.5/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-games/simgear/files/simgear-2.4.0-boost148.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/simgear/files/simgear-2.4.0-boost148.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/simgear/files/simgear-2.4.0-boost148.patch?rev=1.1&content-type=text/plain
14
15 Index: simgear-2.4.0-boost148.patch
16 ===================================================================
17 --- simgear-2.4.0/simgear/structure/Singleton.hxx
18 +++ simgear-2.4.0/simgear/structure/Singleton.hxx
19 @@ -1,7 +1,7 @@
20 #ifndef SIMGEAR_SINGLETON_HXX
21 #define SIMGEAR_SINGLETON_HXX 1
22
23 -#include <boost/pool/detail/singleton.hpp>
24 +#include "boost/thread/detail/singleton.hpp"
25
26 #include <osg/Referenced>
27 #include <osg/ref_ptr>
28 @@ -22,7 +22,7 @@
29 static Class* instance()
30 {
31 Class& singleton
32 - = boost::details::pool::singleton_default<Class>::instance();
33 + = boost::detail::thread::singleton<Class>::instance();
34 return &singleton;
35 }
36 };
37 @@ -38,7 +38,7 @@
38 static RefClass* instance()
39 {
40 SingletonRefPtr& singleton
41 - = boost::details::pool::singleton_default<SingletonRefPtr>::instance();
42 + = boost::detail::thread::singleton<SingletonRefPtr>::instance();
43 return singleton.ptr.get();
44 }
45 private: