[glibmm] utility: Correct the deprecation ifndef.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] utility: Correct the deprecation ifndef.
- Date: Mon, 18 Jan 2016 15:34:10 +0000 (UTC)
commit 98b24c483d590a9ec5ea5ec9932698fa02689441
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Jan 18 16:28:31 2016 +0100
utility: Correct the deprecation ifndef.
And correct the documentation.
glib/glibmm/utility.h | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/glib/glibmm/utility.h b/glib/glibmm/utility.h
index d49947c..4b773d7 100644
--- a/glib/glibmm/utility.h
+++ b/glib/glibmm/utility.h
@@ -56,14 +56,13 @@
namespace Glib
{
-// These are used by gtkmmproc-generated type conversions:
+// These are used by gmmproc-generated type conversions:
-#ifdef GLIBMM_DISABLE_DEPRECATED
-// TODO: Replace this with std::unique_ptr?
+#ifndef GLIBMM_DISABLE_DEPRECATED
/** Helper to deal with memory allocated
* by GLib functions in an exception-safe manner.
*
- * @deprecated Use UniquePtrGFree instead.
+ * @deprecated Use make_unique_ptr_gfree() instead.
*/
template <typename T>
class ScopedPtr
@@ -85,7 +84,7 @@ public:
/** Helper to deal with memory allocated
* by GLib functions in an exception-safe manner.
*
- * This just creates a unique_ptr that uses g_free as its deleter.
+ * This just creates a std::unique_ptr that uses g_free() as its deleter.
*/
template <typename T>
std::unique_ptr<T[], decltype(&g_free)> make_unique_ptr_gfree(T* p)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]