fixed gcc4 compile errors

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@53 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/contrib/prtview/prtview.cpp b/contrib/prtview/prtview.cpp
index 113d7b96674bc6f1db62757b11de54faf89607a0..c5ed86c91080d9b25a0a27a5167c2affffbc21dd 100644 (file)
--- 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 de988343c28fb71dadd6981a0a094721be12448e..77eaa7ce723012ec929268c8458b3b14855babfe 100644 (file)
--- a/libs/signal/signal.h
+++ b/libs/signal/signal.h
@@ -349,7 +349,7 @@ class Signal1 : public SignalBase< SignalHandler1<FirstArgument> >
 public:
   void operator()(FirstArgument a1) const
   {
-    invokeSignalHandlers(begin(), end(), Functor1Invoke<typename Base::handler_type>(a1));
+    invokeSignalHandlers(Base::begin(), Base::end(), Functor1Invoke<typename Base::handler_type>(a1));
   }
 };
 
@@ -360,7 +360,7 @@ class Signal2 : public SignalBase< SignalHandler2<FirstArgument, SecondArgument>
 public:
   void operator()(FirstArgument a1, SecondArgument a2) const
   {
-    invokeSignalHandlers(begin(), end(), Functor2Invoke<typename Base::handler_type>(a1, a2));
+    invokeSignalHandlers(Base::begin(), Base::end(), Functor2Invoke<typename Base::handler_type>(a1, a2));
   }
 };
 
@@ -371,7 +371,7 @@ class Signal3 : public SignalBase< SignalHandler3<FirstArgument, SecondArgument,
 public:
   void operator()(FirstArgument a1, SecondArgument a2, ThirdArgument a3) const
   {
-    invokeSignalHandlers(begin(), end(), Functor3Invoke<typename Base::handler_type>(a1, a2, a3));
+    invokeSignalHandlers(Base::begin(), Base::end(), Functor3Invoke<typename Base::handler_type>(a1, a2, a3));
   }
 };