|
Line
Link Here
|
| 0 |
-- simgear-2.4.0/simgear/structure/Singleton.hxx |
0 |
++ simgear-2.4.0/simgear/structure/Singleton.hxx |
|
Lines 1-7
Link Here
|
| 1 |
#ifndef SIMGEAR_SINGLETON_HXX |
1 |
#ifndef SIMGEAR_SINGLETON_HXX |
| 2 |
#define SIMGEAR_SINGLETON_HXX 1 |
2 |
#define SIMGEAR_SINGLETON_HXX 1 |
| 3 |
|
3 |
|
| 4 |
#include <boost/pool/detail/singleton.hpp> |
4 |
#include "boost/thread/detail/singleton.hpp" |
| 5 |
|
5 |
|
| 6 |
#include <osg/Referenced> |
6 |
#include <osg/Referenced> |
| 7 |
#include <osg/ref_ptr> |
7 |
#include <osg/ref_ptr> |
|
Lines 22-28
Link Here
|
| 22 |
static Class* instance() |
22 |
static Class* instance() |
| 23 |
{ |
23 |
{ |
| 24 |
Class& singleton |
24 |
Class& singleton |
| 25 |
= boost::details::pool::singleton_default<Class>::instance(); |
25 |
= boost::detail::thread::singleton<Class>::instance(); |
| 26 |
return &singleton; |
26 |
return &singleton; |
| 27 |
} |
27 |
} |
| 28 |
}; |
28 |
}; |
|
Lines 38-44
Link Here
|
| 38 |
static RefClass* instance() |
38 |
static RefClass* instance() |
| 39 |
{ |
39 |
{ |
| 40 |
SingletonRefPtr& singleton |
40 |
SingletonRefPtr& singleton |
| 41 |
= boost::details::pool::singleton_default<SingletonRefPtr>::instance(); |
41 |
= boost::detail::thread::singleton<SingletonRefPtr>::instance(); |
| 42 |
return singleton.ptr.get(); |
42 |
return singleton.ptr.get(); |
| 43 |
} |
43 |
} |
| 44 |
private: |
44 |
private: |
