* mln/core/internal/image_base.hh: Use mln::util::tracked_ptr
with its fully qualified name.
---
milena/ChangeLog | 7 +++++++
milena/mln/core/internal/image_base.hh | 10 +++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 47e0c5e..be75602 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-23 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Help SWIG wrap mln::internal::image_base.
+
+ * mln/core/internal/image_base.hh: Use mln::util::tracked_ptr
+ with its fully qualified name.
+
2014-05-22 Roland Levillain <roland(a)lrde.epita.fr>
Fix Doxygen command names in Milena documentation.
diff --git a/milena/mln/core/internal/image_base.hh
b/milena/mln/core/internal/image_base.hh
index 1b068ca..3cdbdad 100644
--- a/milena/mln/core/internal/image_base.hh
+++ b/milena/mln/core/internal/image_base.hh
@@ -1,5 +1,5 @@
-// Copyright (C) 2007, 2008, 2009, 2012, 2013 EPITA Research and
-// Development Laboratory (LRDE)
+// Copyright (C) 2007, 2008, 2009, 2012, 2013, 2014 EPITA Research and
+// Development Laboratory (LRDE).
//
// This file is part of Olena.
//
@@ -158,7 +158,7 @@ namespace mln
const void* id_() const;
/// \brief Hook to the image data.
- const util::tracked_ptr< internal::data<E> >& hook_data_() const;
+ const mln::util::tracked_ptr< internal::data<E> >& hook_data_()
const;
/// \endcond
@@ -173,7 +173,7 @@ namespace mln
/// \cond INTERNAL_API
/// Internal data, sharable by several images.
- util::tracked_ptr< internal::data<E> > data_;
+ mln::util::tracked_ptr< internal::data<E> > data_;
/// \endcond
};
@@ -269,7 +269,7 @@ namespace mln
template <typename T, typename S, typename E>
inline
- const util::tracked_ptr< internal::data<E> >&
+ const mln::util::tracked_ptr< internal::data<E> >&
image_base<T, S, E>::hook_data_() const
{
return data_;
--
1.7.10.4
Show replies by date