diff options
Diffstat (limited to 'x11-misc/xosview/files/xosview-gcc-3.3.1.patch')
| -rw-r--r-- | x11-misc/xosview/files/xosview-gcc-3.3.1.patch | 153 |
1 files changed, 153 insertions, 0 deletions
diff --git a/x11-misc/xosview/files/xosview-gcc-3.3.1.patch b/x11-misc/xosview/files/xosview-gcc-3.3.1.patch new file mode 100644 index 000000000000..1421a756b4fb --- /dev/null +++ b/x11-misc/xosview/files/xosview-gcc-3.3.1.patch @@ -0,0 +1,153 @@ +diff -ur xosview-1.8.0/linux/cpumeter.cc xosview-1.8.0-gcc3.3/linux/cpumeter.cc +--- xosview-1.8.0/linux/cpumeter.cc 1999-02-24 22:16:20.000000000 +0000 ++++ xosview-1.8.0-gcc3.3/linux/cpumeter.cc 2003-10-14 21:07:57.000000000 +0000 +@@ -11,7 +11,7 @@ + #include <fstream.h> + #include <stdlib.h> + #include <string.h> +-#include <strstream.h> ++#include <strstream> + #include <ctype.h> + + static const char STATFILENAME[] = "/proc/stat"; +@@ -126,7 +126,7 @@ + + const char *CPUMeter::cpuStr(int num){ + static char buffer[32]; +- ostrstream str(buffer, 32); ++ std::ostrstream str(buffer, 32); + + str << "cpu"; + if (num != 0) +diff -ur xosview-1.8.0/linux/intmeter.cc xosview-1.8.0-gcc3.3/linux/intmeter.cc +--- xosview-1.8.0/linux/intmeter.cc 1998-10-03 23:35:24.000000000 +0000 ++++ xosview-1.8.0-gcc3.3/linux/intmeter.cc 2003-10-14 21:05:13.000000000 +0000 +@@ -10,7 +10,7 @@ + #include "xosview.h" + #include "cpumeter.h" + #include <fstream.h> +-#include <strstream.h> ++#include <strstream> + #include <stdlib.h> + #ifdef __alpha__ + #include <asm/irq.h> +@@ -76,7 +76,7 @@ + char buffer[128]; + vfile >> buffer >> buffer >> buffer; + *strrchr(buffer, '.') = '\0'; +- istrstream is(buffer, 128); ++ std::istrstream is(buffer, 128); + float rval = 0.0; + is >> rval; + +diff -ur xosview-1.8.0/linux/memmeter.cc xosview-1.8.0-gcc3.3/linux/memmeter.cc +--- xosview-1.8.0/linux/memmeter.cc 1999-11-06 22:48:17.000000000 +0000 ++++ xosview-1.8.0-gcc3.3/linux/memmeter.cc 2003-10-14 21:05:13.000000000 +0000 +@@ -8,7 +8,7 @@ + #include "memmeter.h" + #include "xosview.h" + #include <fstream.h> +-#include <strstream.h> ++#include <strstream> + #include <stdlib.h> + + static const char MEMFILENAME[] = "/proc/meminfo"; +@@ -94,7 +94,7 @@ + LineInfo *rval = new LineInfo[len]; + + char buf[256]; +- istrstream line(buf, 256); ++ std::istrstream line(buf, 256); + + // Get the info from the "standard" meminfo file. + int lineNum = 0; +@@ -143,7 +143,7 @@ + } + + char buf[256]; +- istrstream line(buf, 256); ++ std::istrstream line(buf, 256); + + char ignore[256]; + +diff -ur xosview-1.8.0/linux/raidmeter.cc xosview-1.8.0-gcc3.3/linux/raidmeter.cc +--- xosview-1.8.0/linux/raidmeter.cc 1999-11-12 05:28:24.000000000 +0000 ++++ xosview-1.8.0-gcc3.3/linux/raidmeter.cc 2003-10-14 21:05:13.000000000 +0000 +@@ -8,7 +8,7 @@ + #include "raidmeter.h" + #include "xosview.h" + #include <fstream.h> +-#include <strstream.h> ++#include <strstream> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +@@ -19,7 +19,7 @@ + getRAIDstate(); + if(disknum<1) + disableMeter(); +- ostrstream os; ++ std::ostrstream os; + os << "MD" << raiddev << ends; + legend(os.str()); + delete[] os.str(); +@@ -71,7 +71,7 @@ + int RAIDMeter::find1(char *key, char *findwhat, int num1){ + char buf[80]; + int rc; +- ostrstream os(buf, 80); ++ std::ostrstream os(buf, 80); + os << findwhat << "." << num1 << ends; + rc=!strncmp(buf,key, 80); + return rc; +@@ -80,7 +80,7 @@ + int RAIDMeter::find2(char *key, char *findwhat, int num1, int num2){ + char buf[80]; + int rc; +- ostrstream os(buf, 80); ++ std::ostrstream os(buf, 80); + os << findwhat << "." << num1 << "." << num2 << ends; + rc=!strncmp(buf,key, 80); + return rc; +diff -ur xosview-1.8.0/linux/serialmeter.cc xosview-1.8.0-gcc3.3/linux/serialmeter.cc +--- xosview-1.8.0/linux/serialmeter.cc 2002-02-24 19:52:01.000000000 +0000 ++++ xosview-1.8.0-gcc3.3/linux/serialmeter.cc 2003-10-14 21:17:01.000000000 +0000 +@@ -16,7 +16,7 @@ + #include <sys/ioctl.h> + #include <errno.h> + #include <stdlib.h> +-#include <strstream.h> ++#include <strstream> + #include <iomanip.h> + + // This should go away after types.h gets fixed in the kernel. +@@ -136,7 +136,7 @@ + return serinfo.port; + } + else { // Use user specified port base. +- istrstream istrm(res); ++ std::istrstream istrm(res); + unsigned short int tmp = 0; + istrm >> hex >> tmp; + return tmp; +diff -ur xosview-1.8.0/linux/swapmeter.cc xosview-1.8.0-gcc3.3/linux/swapmeter.cc +--- xosview-1.8.0/linux/swapmeter.cc 1999-01-31 20:18:49.000000000 +0000 ++++ xosview-1.8.0-gcc3.3/linux/swapmeter.cc 2003-10-14 21:05:13.000000000 +0000 +@@ -10,7 +10,7 @@ + #include "swapmeter.h" + #include "xosview.h" + #include <fstream.h> +-#include <strstream.h> ++#include <strstream> + #include <stdlib.h> + + #ifdef USESYSCALLS +@@ -90,7 +90,7 @@ + // Get the info from the "standard" meminfo file. + while (!meminfo.eof()){ + meminfo.getline(buf, 256); +- istrstream line(buf, 256); ++ std::istrstream line(buf, 256); + + if(!strncmp("SwapTotal", buf, strlen("SwapTotal"))) + line >> ignore >> total_; |