projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
lib
/
weak_film.h
diff --git
a/src/lib/weak_film.h
b/src/lib/weak_film.h
index 731101474fd30799437f16325317a8005dea298b..7d090bd1700cfc0090736815b68614140c2dbc4d 100644
(file)
--- a/
src/lib/weak_film.h
+++ b/
src/lib/weak_film.h
@@
-24,8
+24,6
@@
#include "dcpomatic_assert.h"
#include "dcpomatic_assert.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
class Film;
class Film;
@@
-35,15
+33,15
@@
template <class T>
class WeakFilmTemplate
{
public:
class WeakFilmTemplate
{
public:
- WeakFilmTemplate (
boost
::weak_ptr<T> f)
+ WeakFilmTemplate (
std
::weak_ptr<T> f)
: _film(f)
{}
protected:
: _film(f)
{}
protected:
-
boost
::weak_ptr<T> _film;
+
std
::weak_ptr<T> _film;
-
boost
::shared_ptr<T> film () const {
-
boost
::shared_ptr<T> f = _film.lock();
+
std
::shared_ptr<T> film () const {
+
std
::shared_ptr<T> f = _film.lock();
DCPOMATIC_ASSERT (f);
return f;
}
DCPOMATIC_ASSERT (f);
return f;
}