From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 16 Jun 2014 20:08:26 +0000 (+0300)
Subject: Make older gcc versions happy
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=2c9a7979a41def3ee4c7fea7163718af25a26e61;p=libs%2Fgl.git

Make older gcc versions happy
---

diff --git a/source/bindable.h b/source/bindable.h
index 8ea78034..8a5821b9 100644
--- a/source/bindable.h
+++ b/source/bindable.h
@@ -99,7 +99,7 @@ private:
 	template<typename T>
 	void init(const T *o)
 	{
-		cleanup = (o ? &unbind<T> : 0);
+		cleanup = (o ? static_cast<CleanupFunc *>(&unbind<T>) : 0);
 		slot = 0;
 		if(o)
 			o->bind();
@@ -110,7 +110,7 @@ private:
 	template<typename T, typename S>
 	void init(const T *o, S s)
 	{
-		cleanup = (o ? &unbind_from<T, S> : 0);
+		cleanup = (o ? static_cast<CleanupFunc *>(&unbind_from<T, S>) : 0);
 		slot = s;
 		if(o)
 			o->bind_to(s);
@@ -170,7 +170,7 @@ private:
 	{
 		old = T::current();
 		slot = 0;
-		cleanup = (o!=old ? &restore<T> : 0);
+		cleanup = (o!=old ? static_cast<CleanupFunc *>(&restore<T>) : 0);
 		if(o)
 			o->bind();
 		else if(old)
@@ -182,7 +182,7 @@ private:
 	{
 		old = T::current(s);
 		slot = s;
-		cleanup = (o!=old ? &restore_to<T, S> : 0);
+		cleanup = (o!=old ? static_cast<CleanupFunc *>(&restore_to<T, S>) : 0);
 		if(o)
 			o->bind_to(s);
 		else if(old)