Fix build on gcc-3.3.x

Submitted by:   Simon Barner <barner@in.tum.de>

20 files changed, 254 insertions, 7 deletions

diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile
index e5611da77d56..6e6aa6d9e403 100644
--- a/x11-toolkits/viewklass/Makefile
+++ b/x11-toolkits/viewklass/Makefile
@@ -30,10 +30,6 @@ USE_MOTIF=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/^CFLAGS=/CFLAGS+=/g ; \
 		 s/^CXXFLAGS=/CXXFLAGS+=/g ; \
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkAlignmentGroup.h b/x11-toolkits/viewklass/files/patch-Vk::VkAlignmentGroup.h
new file mode 100644
index 000000000000..8482b4478e01
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkAlignmentGroup.h
@@ -0,0 +1,12 @@
+--- ./Vk/VkAlignmentGroup.h.orig	Wed Jul 23 02:43:07 2003
++++ ./Vk/VkAlignmentGroup.h	Wed Jul 23 02:45:35 2003
+@@ -24,6 +24,9 @@
+ 
+ #include <Vk/VkWidgetList.h>
+ #include <Vk/VkOptionMenu.h>
++#include <iostream>
++
++using std::ostream;
+ 
+ class VkAlignmentGroup : public VkWidgetList {
+ public:
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkCallbackList.h b/x11-toolkits/viewklass/files/patch-Vk::VkCallbackList.h
new file mode 100644
index 000000000000..3e8aaa3b585e
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkCallbackList.h
@@ -0,0 +1,12 @@
+--- ./Vk/VkCallbackList.h.orig	Wed Jul 23 02:06:54 2003
++++ ./Vk/VkCallbackList.h	Wed Jul 23 02:07:15 2003
+@@ -44,6 +44,9 @@
+ #include <Vk/VkComponent.h>
+ #include <Vk/VkCallbackObject.h>
+ 
++using std::vector;
++using std::string;
++
+ struct VkCallbackListEntry {
+     enum CallbackType type;
+     VkCallbackObject *component;
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkCallbackObject.h b/x11-toolkits/viewklass/files/patch-Vk::VkCallbackObject.h
new file mode 100644
index 000000000000..ba65f9bfb010
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkCallbackObject.h
@@ -0,0 +1,11 @@
+--- ./Vk/VkCallbackObject.h.orig	Wed Jul 23 02:07:33 2003
++++ ./Vk/VkCallbackObject.h	Wed Jul 23 02:07:48 2003
+@@ -42,6 +42,8 @@
+ 
+ #include <Vk/VkConfig.h>
+ 
++using std::vector;
++
+ class VkCallbackObject;
+ 
+ typedef void (VkCallbackObject::*VkCallbackMethod)(
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkComponentList.h b/x11-toolkits/viewklass/files/patch-Vk::VkComponentList.h
new file mode 100644
index 000000000000..b61f4825a811
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkComponentList.h
@@ -0,0 +1,24 @@
+--- ./Vk/VkComponentList.h.orig	Wed Jul 23 02:09:51 2003
++++ ./Vk/VkComponentList.h	Wed Jul 23 02:18:22 2003
+@@ -41,6 +41,8 @@
+ 
+ #include <Vk/VkConfig.h>
+ 
++using std::vector;
++
+ class VkComponent;
+ 
+ class VkComponentList {
+@@ -59,10 +61,10 @@
+     VkComponent* operator[](int indx) const { return elements[indx]; }
+ 
+ 	void insert(int pos, VkComponent* c)
+-		{ elements.insert(&elements[pos], c); }
++		{ elements.insert(elements.begin () + pos, c); }
+     
+ 	void remove(int pos)
+-		{ elements.erase(&elements[pos]); }
++		{ elements.erase(elements.begin () + pos); }
+     
+ private:
+     vector<VkComponent*> elements;
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkDialogManager.h b/x11-toolkits/viewklass/files/patch-Vk::VkDialogManager.h
new file mode 100644
index 000000000000..58fdc4adf3fc
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkDialogManager.h
@@ -0,0 +1,11 @@
+--- ./Vk/VkDialogManager.h.orig	Wed Jul 23 02:13:42 2003
++++ ./Vk/VkDialogManager.h	Wed Jul 23 02:13:57 2003
+@@ -49,6 +49,8 @@
+ #include <Vk/VkResource.h>
+ #include <Vk/VkSimpleWindow.h>
+ 
++using std::string;
++
+ class VkDialogManager : public VkComponent {
+ public:
+     typedef enum {OK, APPLY, CANCEL} VkDialogReason;
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkMenuItem.h b/x11-toolkits/viewklass/files/patch-Vk::VkMenuItem.h
new file mode 100644
index 000000000000..864ac9c2eaa5
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkMenuItem.h
@@ -0,0 +1,11 @@
+--- ./Vk/VkMenuItem.h.orig	Wed Jul 23 02:22:17 2003
++++ ./Vk/VkMenuItem.h	Wed Jul 23 02:22:29 2003
+@@ -41,6 +41,8 @@
+ #include <Vk/VkComponent.h>
+ #include <Vk/VkWidgetList.h>
+ 
++using std::string;
++
+ typedef enum {ACTION, ACTIONWIDGET, CONFIRMFIRSTACTION, TOGGLE, LABEL,
+ 			  SEPARATOR, SUBMENU, RADIOSUBMENU, BAR, OPTION, POPUP, OBJECT,
+ 			  END} VkMenuItemType;
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkNameList.h b/x11-toolkits/viewklass/files/patch-Vk::VkNameList.h
new file mode 100644
index 000000000000..7634a25fadff
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkNameList.h
@@ -0,0 +1,12 @@
+--- ./Vk/VkNameList.h.orig	Wed Jul 23 02:23:57 2003
++++ ./Vk/VkNameList.h	Wed Jul 23 02:24:28 2003
+@@ -43,6 +43,9 @@
+ #include <Xm/Xm.h>
+ #include <Vk/VkConfig.h>
+ 
++using std::vector;
++using std::string;
++
+ class VkNameList {
+  public:
+     VkNameList();
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkPrefItem.h b/x11-toolkits/viewklass/files/patch-Vk::VkPrefItem.h
new file mode 100644
index 000000000000..2625a02c2aab
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkPrefItem.h
@@ -0,0 +1,11 @@
+--- ./Vk/VkPrefItem.h.orig	Wed Jul 23 02:40:46 2003
++++ ./Vk/VkPrefItem.h	Wed Jul 23 02:41:01 2003
+@@ -45,6 +45,8 @@
+ 
+ #include <string>
+ 
++using std::string;
++
+ class VkPrefItem : public VkComponent {
+ public:
+     enum VkPrefItemType {PI_group, PI_list, PI_radio, PI_text, PI_toggle,
diff --git a/x11-toolkits/viewklass/files/patch-VkAlignmentGroup.C b/x11-toolkits/viewklass/files/patch-VkAlignmentGroup.C
new file mode 100644
index 000000000000..73dec33f02da
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkAlignmentGroup.C
@@ -0,0 +1,11 @@
+--- ./VkAlignmentGroup.C.orig	Wed Jul 23 02:44:15 2003
++++ ./VkAlignmentGroup.C	Wed Jul 23 02:45:22 2003
+@@ -36,6 +36,8 @@
+ 
+ #include <Vk/VkAlignmentGroup.h>
+ 
++using std::endl;
++
+ VkAlignmentGroup::VkAlignmentGroup()
+ 	: VkWidgetList(),
+ 	  _maxWidth(0),
diff --git a/x11-toolkits/viewklass/files/patch-VkCallbackObject.C b/x11-toolkits/viewklass/files/patch-VkCallbackObject.C
new file mode 100644
index 000000000000..548ab5e38328
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkCallbackObject.C
@@ -0,0 +1,12 @@
+--- ./VkCallbackObject.C.orig	Wed Jul 23 02:08:26 2003
++++ ./VkCallbackObject.C	Wed Jul 23 02:09:04 2003
+@@ -45,6 +45,9 @@
+ #include <Vk/VkCallbackObject.h>
+ #include <Vk/VkCallbackList.h>
+ 
++using std::cerr;
++using std::endl;
++
+ VkCallbackObject::VkCallbackObject()
+ {
+ }
diff --git a/x11-toolkits/viewklass/files/patch-VkComponent.C b/x11-toolkits/viewklass/files/patch-VkComponent.C
new file mode 100644
index 000000000000..630cbf4b7d93
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkComponent.C
@@ -0,0 +1,13 @@
+--- ./VkComponent.C.orig	Wed Jul 23 02:12:18 2003
++++ ./VkComponent.C	Wed Jul 23 02:13:09 2003
+@@ -46,6 +46,10 @@
+ #include <Vk/VkComponent.h>
+ #include <Vk/VkApp.h>
+ 
++using std::string;
++using std::cerr;
++using std::endl;
++
+ const char *const VkComponent::deleteCallback = "VkComponentDeleteCallback";
+ 
+ VkComponent::VkComponent(const char *name)
diff --git a/x11-toolkits/viewklass/files/patch-VkNameList.C b/x11-toolkits/viewklass/files/patch-VkNameList.C
new file mode 100644
index 000000000000..d3653c9caf65
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkNameList.C
@@ -0,0 +1,11 @@
+--- ./VkNameList.C.orig	Wed Jul 23 02:39:09 2003
++++ ./VkNameList.C	Wed Jul 23 02:39:23 2003
+@@ -105,7 +105,7 @@
+ }
+ 
+ void
+-VkNameList::remove(int index, int count=1)
++VkNameList::remove(int index, int count)
+ {
+ 	_contents.erase(_contents.begin() + index,
+ 					_contents.begin() + index + count);
diff --git a/x11-toolkits/viewklass/files/patch-VkPipe.C b/x11-toolkits/viewklass/files/patch-VkPipe.C
new file mode 100644
index 000000000000..5bcad5f81c06
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkPipe.C
@@ -0,0 +1,11 @@
+--- ./VkPipe.C.orig	Wed Jul 23 02:33:13 2003
++++ ./VkPipe.C	Wed Jul 23 03:05:28 2003
+@@ -67,7 +67,7 @@
+     _input->attach(pipefd[0], XtInputReadMask);
+     _input->addCallback(VkInput::inputCallback, 
+ 						this,
+-						(VkCallbackMethod)&(VkPipe::handleInput));
++						(VkCallbackMethod)(&VkPipe::handleInput));
+ }
+ 
+ VkPipe::~VkPipe()
diff --git a/x11-toolkits/viewklass/files/patch-VkPrefRadio.C b/x11-toolkits/viewklass/files/patch-VkPrefRadio.C
new file mode 100644
index 000000000000..fa35b8424b0a
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkPrefRadio.C
@@ -0,0 +1,13 @@
+--- ./VkPrefRadio.C.orig	Wed Jul 23 02:42:07 2003
++++ ./VkPrefRadio.C	Wed Jul 23 02:42:38 2003
+@@ -40,6 +40,10 @@
+ #include <Xm/Form.h>
+ 
+ #include <Vk/VkPrefRadio.h>
++#include <iostream>
++
++using std::cerr;
++using std::endl;
+ 
+ // A VkPrefRadio is a vertical VkPrefGroup with no label
+ VkPrefRadio::VkPrefRadio(const char *name,
diff --git a/x11-toolkits/viewklass/files/patch-VkRadioGroup.C b/x11-toolkits/viewklass/files/patch-VkRadioGroup.C
new file mode 100644
index 000000000000..0393d8c8b826
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkRadioGroup.C
@@ -0,0 +1,31 @@
+--- ./VkRadioGroup.C.orig	Wed Jul 23 02:25:08 2003
++++ ./VkRadioGroup.C	Wed Jul 23 02:31:58 2003
+@@ -47,11 +47,15 @@
+ #include <Xm/ToggleBG.h>
+ #include <Xm/PushB.h>
+ #include <Xm/PushBG.h>
++#include <iostream>
++
++using std::cerr;
++using std::endl;
+ 
+ VkRadioGroup::VkRadioGroup()
+ 	: VkWidgetList()
+ {
+-    _currentlySelected = 0;
++    //_currentlySelected = 0;
+ }
+ 
+ void 
+@@ -77,9 +81,9 @@
+ void 
+ VkRadioGroup::remove(Widget item)
+ {
+-    if (*_currentlySelected == item)
++    /*if (*_currentlySelected == item)
+         _currentlySelected = 0;
+-    else if (_currentlySelected > VkWidgetList::find(item))
++    else */ if (_currentlySelected > VkWidgetList::find(item))
+         _currentlySelected --;
+ 
+ 	XtRemoveCallback(item, XmNvalueChangedCallback,
diff --git a/x11-toolkits/viewklass/files/patch-VkSimpleWindow.C b/x11-toolkits/viewklass/files/patch-VkSimpleWindow.C
new file mode 100644
index 000000000000..87d0ab1e0612
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkSimpleWindow.C
@@ -0,0 +1,13 @@
+--- ./VkSimpleWindow.C.orig	Wed Jul 23 02:18:56 2003
++++ ./VkSimpleWindow.C	Wed Jul 23 02:20:37 2003
+@@ -44,6 +44,10 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xmu/Editres.h>
+ 
++using std::cerr;
++using std::endl;
++using std::exception;
++
+ static char* rcsid
+ #ifdef __GNUC__
+ __attribute__ ((unused))
diff --git a/x11-toolkits/viewklass/files/patch-VkSubProcess.C b/x11-toolkits/viewklass/files/patch-VkSubProcess.C
new file mode 100644
index 000000000000..2be8e0e9e2b7
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkSubProcess.C
@@ -0,0 +1,13 @@
+--- ./VkSubProcess.C.orig	Wed Jul 23 02:39:49 2003
++++ ./VkSubProcess.C	Wed Jul 23 02:40:21 2003
+@@ -40,6 +40,10 @@
+ #include <signal.h>
+ #include <stdio.h>
+ #include <unistd.h> // for exec*
++#include <iostream>
++
++using std::cerr;
++using std::endl;
+ 
+ VkSubProcess::VkSubProcess(char *prog,
+ 						   VkNameList *given,
diff --git a/x11-toolkits/viewklass/files/patch-VkTrace.C b/x11-toolkits/viewklass/files/patch-VkTrace.C
index 7c4491357130..abeb95f55236 100644
--- a/x11-toolkits/viewklass/files/patch-VkTrace.C
+++ b/x11-toolkits/viewklass/files/patch-VkTrace.C
@@ -1,10 +1,16 @@
---- VkTrace.C.orig	Wed Jun  5 00:04:51 2002
-+++ VkTrace.C	Wed Jun  5 00:05:25 2002
-@@ -28,6 +28,7 @@
+--- VkTrace.C.orig	Thu Jul 11 08:46:58 2002
++++ VkTrace.C	Wed Jul 23 03:22:53 2003
+@@ -28,8 +28,13 @@
  #include <stdio.h>
  #include <time.h>
  #include <string.h>
 +#include <stdarg.h>
  
  #include <Vk/VkTrace.h>
++#include <fstream>
++
++using std::ofstream;
++using std::endl;
+ 
+ ofstream* vkTraceOut = 0;
  
diff --git a/x11-toolkits/viewklass/files/patch-VkWindow.C b/x11-toolkits/viewklass/files/patch-VkWindow.C
new file mode 100644
index 000000000000..059f9bfa0992
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkWindow.C
@@ -0,0 +1,13 @@
+--- ./VkWindow.C.orig	Wed Jul 23 02:21:06 2003
++++ ./VkWindow.C	Wed Jul 23 02:21:39 2003
+@@ -42,6 +42,10 @@
+ #include <Vk/VkWindow.h>
+ #include <iostream.h>
+ 
++using std::cerr;
++using std::endl;
++using std::exception;
++
+ VkWindow::VkWindow(const char* name,
+ 				   ArgList args,
+ 				   Cardinal argCount)