From: spog Date: Mon, 10 Apr 2006 18:19:55 +0000 (+0000) Subject: fixed gcc4 compile errors X-Git-Tag: xonotic-v0.7.0~16^2~12^2~243 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=ac8ea48034e097304d13a6aef8320c420b63ab4a;p=xonotic%2Fnetradiant.git fixed gcc4 compile errors git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@51 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- diff --git a/libs/generic/callback.h b/libs/generic/callback.h index ccc779e6..7141da4a 100644 --- a/libs/generic/callback.h +++ b/libs/generic/callback.h @@ -279,7 +279,7 @@ public: } result_type operator()() const { - return getThunk()(getEnvironment()); + return Base::getThunk()(Base::getEnvironment()); } }; @@ -325,7 +325,7 @@ public: } result_type operator()(FirstArgument firstArgument) const { - return getThunk()(getEnvironment(), firstArgument); + return Base::getThunk()(Base::getEnvironment(), firstArgument); } }; @@ -368,7 +368,7 @@ public: } result_type operator()(FirstArgument firstArgument, SecondArgument secondArgument) const { - return getThunk()(getEnvironment(), firstArgument, secondArgument); + return Base::getThunk()(Base::getEnvironment(), firstArgument, secondArgument); } }; @@ -424,7 +424,7 @@ public: } result_type operator()(FirstArgument firstArgument, SecondArgument secondArgument, ThirdArgument thirdArgument) const { - return getThunk()(getEnvironment(), firstArgument, secondArgument, thirdArgument); + return Base::getThunk()(Base::getEnvironment(), firstArgument, secondArgument, thirdArgument); } };