fixed gcc compile errors

[xonotic/netradiant.git] / libs / generic / callback.h

diff --git a/libs/generic/callback.h b/libs/generic/callback.h
index 68fc0662c6d17c049ba540a3cebc219a7e5b4b04..ccc779e6ed7054027220397fe5d480e1ade4a5a0 100644 (file)
--- a/libs/generic/callback.h
+++ b/libs/generic/callback.h
@@ -215,7 +215,7 @@ public:
   }
 };
 
-template<typename typename Thunk_>
+template<typename Thunk_>
 class CallbackBase
 {
   void* m_environment;
@@ -235,17 +235,17 @@ public:
   }
 };
 
-template<typename typename Thunk>
+template<typename Thunk>
 inline bool operator==(const CallbackBase<Thunk>& self, const CallbackBase<Thunk>& other)
 {
   return self.getEnvironment() == other.getEnvironment() && self.getThunk() == other.getThunk();
 }
-template<typename typename Thunk>
+template<typename Thunk>
 inline bool operator!=(const CallbackBase<Thunk>& self, const CallbackBase<Thunk>& other)
 {
   return !(self == other);
 }
-template<typename typename Thunk>
+template<typename Thunk>
 inline bool operator<(const CallbackBase<Thunk>& self, const CallbackBase<Thunk>& other)
 {
   return self.getEnvironment() < other.getEnvironment() || 
@@ -274,7 +274,7 @@ public:
   Callback0(const BindFirstOpaque<Caller>& caller) : Base(caller.getEnvironment(), BindFirstOpaque<Caller>::thunk)
   {
   }
-  Callback0(void* environment, Thunk function) : Base(environment, function)
+  Callback0(void* environment, typename Base::Thunk function) : Base(environment, function)
   {
   }
   result_type operator()() const
@@ -320,7 +320,7 @@ public:
   Callback1(const BindFirstOpaque1<Caller>& caller) : Base(caller.getEnvironment(), BindFirstOpaque1<Caller>::thunk)
   {
   }
-  Callback1(void* environment, Thunk function) : Base(environment, function)
+  Callback1(void* environment, typename Base::Thunk function) : Base(environment, function)
   {
   }
   result_type operator()(FirstArgument firstArgument) const
@@ -363,7 +363,7 @@ public:
   Callback2(const BindFirstOpaque2<Caller>& caller) : Base(caller.getEnvironment(), BindFirstOpaque2<Caller>::thunk)
   {
   }
-  Callback2(void* environment, Thunk function) : Base(environment, function)
+  Callback2(void* environment, typename Base::Thunk function) : Base(environment, function)
   {
   }
   result_type operator()(FirstArgument firstArgument, SecondArgument secondArgument) const
@@ -419,7 +419,7 @@ public:
   Callback3(const BindFirstOpaque3<Caller>& caller) : Base(caller.getEnvironment(), BindFirstOpaque3<Caller>::thunk)
   {
   }
-  Callback3(void* environment, Thunk function) : Base(environment, function)
+  Callback3(void* environment, typename Base::Thunk function) : Base(environment, function)
   {
   }
   result_type operator()(FirstArgument firstArgument, SecondArgument secondArgument, ThirdArgument thirdArgument) const