From ccdd63c15b9132aa81c88584b7f405feb6d0a6b1 Mon Sep 17 00:00:00 2001 From: spog Date: Mon, 10 Apr 2006 18:38:48 +0000 Subject: [PATCH] fixed gcc4 compile errors git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@53 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- contrib/prtview/prtview.cpp | 2 +- libs/signal/signal.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/prtview/prtview.cpp b/contrib/prtview/prtview.cpp index 113d7b96..c5ed86c9 100644 --- a/contrib/prtview/prtview.cpp +++ b/contrib/prtview/prtview.cpp @@ -232,7 +232,7 @@ void QERPlug_Dispatch(const char* p, float* vMin, float* vMax, bool bSingleBrush } else { - globalOutputStream() << MSG_PREFIX "Portal file load aborted.\n", portals.fn; + globalOutputStream() << MSG_PREFIX "Portal file load aborted.\n"; } } else if (!strcmp(p,Q3R_CMD_RELEASE)) diff --git a/libs/signal/signal.h b/libs/signal/signal.h index de988343..77eaa7ce 100644 --- a/libs/signal/signal.h +++ b/libs/signal/signal.h @@ -349,7 +349,7 @@ class Signal1 : public SignalBase< SignalHandler1 > public: void operator()(FirstArgument a1) const { - invokeSignalHandlers(begin(), end(), Functor1Invoke(a1)); + invokeSignalHandlers(Base::begin(), Base::end(), Functor1Invoke(a1)); } }; @@ -360,7 +360,7 @@ class Signal2 : public SignalBase< SignalHandler2 public: void operator()(FirstArgument a1, SecondArgument a2) const { - invokeSignalHandlers(begin(), end(), Functor2Invoke(a1, a2)); + invokeSignalHandlers(Base::begin(), Base::end(), Functor2Invoke(a1, a2)); } }; @@ -371,7 +371,7 @@ class Signal3 : public SignalBase< SignalHandler3(a1, a2, a3)); + invokeSignalHandlers(Base::begin(), Base::end(), Functor3Invoke(a1, a2, a3)); } }; -- 2.39.2