summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Elstner <daniel.kitta@gmail.com>2009-08-16 23:55:49 +0200
committerDaniel Elstner <daniel.kitta@gmail.com>2009-08-16 23:55:49 +0200
commitcf1100be8bab2b641c5de316ffc948b717c8d2cf (patch)
tree8c169efbeb4075b571f086e0fa06d9992eca08f2
parent879059f5fee9940183667dbdd955db8c7fddc8f3 (diff)
downloadglibmm-cf1100be8bab2b641c5de316ffc948b717c8d2cf.tar.gz
Unbreak List_Iterator::operator->()
* glib/glibmm/containers.h ({S,}List_Iterator::operator->): Use &**this, not &*this. Oops.
-rw-r--r--ChangeLog7
-rw-r--r--glib/glibmm/containers.h6
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ffe8f9f2..1b56547b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2009-08-16 Daniel Elstner <daniel.kitta@gmail.com>
+ Unbreak List_Iterator::operator->()
+
+ * glib/glibmm/containers.h ({S,}List_Iterator::operator->):
+ Use &**this, not &*this. Oops.
+
+2009-08-16 Daniel Elstner <daniel.kitta@gmail.com>
+
Define GLIBMM_USING_STD() as dummy no-op
* glib/glibmmconfig.h.in (GLIBMM_USING_STD): Resurrect macro
diff --git a/glib/glibmm/containers.h b/glib/glibmm/containers.h
index bad040e3..8775495a 100644
--- a/glib/glibmm/containers.h
+++ b/glib/glibmm/containers.h
@@ -122,7 +122,7 @@ public:
return *(pointer)( node_ ? node_->data : glibmm_null_pointer );
}
- pointer operator->() const { return &*this; }
+ pointer operator->() const { return &**this; }
};
///For instance, SList_Iterator< Gtk::Widget >
@@ -173,7 +173,7 @@ public:
return reinterpret_cast<T&>( node_ ? node_->data : glibmm_null_pointer );
}
- pointer operator->() const { return &*this; }
+ pointer operator->() const { return &**this; }
};
@@ -231,7 +231,7 @@ public:
return *static_cast<pointer>(0); // boom!
}
- pointer operator->() const { return &*this; }
+ pointer operator->() const { return &**this; }
Self& operator++()
{