head 1.13; access; symbols OPENPKG_E1_MP_HEAD:1.13 OPENPKG_E1_MP:1.13 OPENPKG_E1_MP_2_STABLE:1.13 OPENPKG_E1_FP:1.13 OPENPKG_2_STABLE_MP:1.13 OPENPKG_2_STABLE_20061018:1.13 OPENPKG_2_STABLE_20060622:1.13 OPENPKG_2_STABLE:1.13.0.6 OPENPKG_2_STABLE_BP:1.13 OPENPKG_2_5_RELEASE:1.13 OPENPKG_2_5_SOLID:1.13.0.4 OPENPKG_2_5_SOLID_BP:1.13 OPENPKG_2_4_RELEASE:1.13 OPENPKG_2_4_SOLID:1.13.0.2 OPENPKG_2_4_SOLID_BP:1.13 OPENPKG_CW_FP:1.13 OPENPKG_2_3_RELEASE:1.12 OPENPKG_2_3_SOLID:1.12.0.2 OPENPKG_2_3_SOLID_BP:1.12 OPENPKG_2_2_RELEASE:1.11 OPENPKG_2_2_SOLID:1.11.0.2 OPENPKG_2_2_SOLID_BP:1.11 OPENPKG_1_STABLE_MP:1.5; locks; strict; comment @# @; 1.13 date 2005.03.17.08.12.56; author rse; state Exp; branches; next 1.12; 1.12 date 2004.10.21.10.54.42; author ms; state Exp; branches; next 1.11; 1.11 date 2004.01.09.20.57.50; author rse; state Exp; branches; next 1.10; 1.10 date 2003.10.08.11.29.27; author ms; state dead; branches; next 1.9; 1.9 date 2003.08.04.12.27.28; author ms; state Exp; branches; next 1.8; 1.8 date 2003.08.04.11.32.36; author ms; state Exp; branches; next 1.7; 1.7 date 2003.08.01.15.15.19; author ms; state Exp; branches; next 1.6; 1.6 date 2003.08.01.11.10.32; author ms; state Exp; branches; next 1.5; 1.5 date 2003.07.03.11.49.05; author ms; state Exp; branches; next 1.4; 1.4 date 2003.03.07.17.25.04; author ms; state Exp; branches; next 1.3; 1.3 date 2003.03.07.14.34.18; author ms; state Exp; branches; next 1.2; 1.2 date 2003.01.31.19.18.55; author rse; state Exp; branches; next 1.1; 1.1 date 2003.01.31.16.18.15; author ms; state Exp; branches; next ; desc @@ 1.13 log @upgrading package: ddd 3.3.10 -> 3.3.11 @ text @Index: ddd/LiterateA.C --- ddd/LiterateA.C.orig 2004-06-07 13:52:53 +0200 +++ ddd/LiterateA.C 2005-03-17 08:51:48 +0100 @@@@ -216,8 +216,12 @@@@ int flags = fcntl(fileno(fp), F_GETFL, 0); if (flags == -1) _raiseIOWarning("cannot get file descriptor status flags"); - if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1) - _raiseIOWarning("cannot set file to non-blocking mode"); + if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1) { +#if defined(__FreeBSD__) + if(errno != EAGAIN) +#endif + _raiseIOWarning("cannot set file to non-blocking mode"); + } #endif // Read stuff @@@@ -251,8 +255,12 @@@@ #if HAVE_FCNTL && defined(F_SETFL) // Reset file state - if (fcntl(fileno(fp), F_SETFL, flags) == -1) - _raiseIOWarning("cannot restore file mode"); + if (fcntl(fileno(fp), F_SETFL, flags) == -1) { +#if defined(__FreeBSD__) + if(errno != EAGAIN) +#endif + _raiseIOWarning("cannot restore file mode"); + } #endif return nitems; Index: ddd/TTYAgent.C --- ddd/TTYAgent.C.orig 2004-06-07 13:52:54 +0200 +++ ddd/TTYAgent.C 2005-03-17 08:51:48 +0100 @@@@ -715,8 +715,19 @@@@ } else { +#if !defined(__FreeBSD__) if (fcntl(master, F_SETFL, flags | O_NONBLOCK) == -1) _raiseIOWarning("cannot set file to non-blocking mode"); +#else + do { + if (fcntl(master, F_SETFL, flags | O_NONBLOCK) != -1) + break; + else if(errno == EAGAIN) + sleep(1); + else + _raiseIOWarning("cannot set file to non-blocking mode"); + } while(errno == EAGAIN); +#endif } #endif @ 1.12 log @upgrading package: ddd 3.3.9 -> 3.3.10 @ text @d2 2 a3 3 diff -Nau ddd/LiterateA.C.orig ddd/LiterateA.C --- ddd/LiterateA.C.orig 2004-06-13 20:49:16.000000000 +0200 +++ ddd/LiterateA.C 2004-09-15 16:57:01.246265199 +0200 d35 2 a36 3 diff -Nau ddd/TTYAgent.C.orig ddd/TTYAgent.C --- ddd/TTYAgent.C.orig 2004-06-13 20:49:22.000000000 +0200 +++ ddd/TTYAgent.C 2004-09-15 16:57:01.248488126 +0200 a56 13 Index: ddd/ddd.C diff -Nau ddd/ddd.C.orig ddd/ddd.C --- ddd/ddd.C.orig 2004-06-13 20:49:33.000000000 +0200 +++ ddd/ddd.C 2004-09-15 16:57:01.259687914 +0200 @@@@ -885,7 +885,7 @@@@ //----------------------------------------------------------------------------- struct RecentItems { - enum RecentItem { R1, R2, R3, R4, R5, R6, R7, R8, R9 }; + enum RecentItem { Re1, R2, R3, R4, R5, R6, R7, R8, R9 }; }; #define RECENT_MENU \ @ 1.11 log @resurrect important and accidentally removed parts of old patch to get rid of TTY warnings under FreeBSD again. @ text @d2 4 a5 3 --- ddd/LiterateA.C.orig 2003-05-24 17:27:03.000000000 +0200 +++ ddd/LiterateA.C 2004-01-09 21:33:33.000000000 +0100 @@@@ -220,8 +220,12 @@@@ d20 1 a20 1 @@@@ -255,8 +259,12 @@@@ d36 4 a39 3 --- ddd/TTYAgent.C.orig 2003-05-24 17:27:05.000000000 +0200 +++ ddd/TTYAgent.C 2004-01-09 21:33:33.000000000 +0100 @@@@ -719,8 +719,19 @@@@ d60 4 a63 3 --- ddd/ddd.C.orig 2003-10-07 13:58:23.000000000 +0200 +++ ddd/ddd.C 2004-01-09 21:33:02.000000000 +0100 @@@@ -883,7 +883,7 @@@@ a71 63 Index: libiberty/strerror.c --- libiberty/strerror.c.orig 2003-10-22 20:46:55.000000000 +0200 +++ libiberty/strerror.c 2004-01-09 21:33:33.000000000 +0100 @@@@ -460,6 +460,7 @@@@ same name, it differs from other implementations in that it is dynamically initialized rather than statically initialized. */ +#ifndef __FreeBSD__ #ifndef HAVE_SYS_ERRLIST static int sys_nerr; @@@@ -470,7 +471,8 @@@@ extern int sys_nerr; extern char *sys_errlist[]; -#endif +#endif /* #ifndef HAVE_SYS_ERRLIST */ +#endif /* #ifndef __FreeBSD__ */ /* Index: libiberty/strsignal.c --- libiberty/strsignal.c.orig 2003-10-22 20:46:55.000000000 +0200 +++ libiberty/strsignal.c 2004-01-09 21:33:33.000000000 +0100 @@@@ -241,6 +241,7 @@@@ same name, it differs from other implementations in that it is dynamically initialized rather than statically initialized. */ +#ifndef __FreeBSD__ #ifndef HAVE_SYS_SIGLIST static int sys_nsig; @@@@ -257,7 +258,8 @@@@ #endif extern const char * const sys_siglist[]; -#endif +#endif /* #ifndef HAVE_SYS_ERRLIST */ +#endif /* #ifndef __FreeBSD__ */ /* Index: termcap/termcap.h --- termcap/termcap.h.orig 1995-05-17 20:47:28.000000000 +0200 +++ termcap/termcap.h 2004-01-09 21:33:17.000000000 +0100 @@@@ -26,7 +26,7 @@@@ extern int tgetflag (const char *name); extern char *tgetstr (const char *name, char **area); -extern char PC; +/*extern char PC;*/ extern short ospeed; extern void tputs (const char *string, int nlines, int (*outfun) ()); @@@@ -45,7 +45,7 @@@@ extern int tgetflag (); extern char *tgetstr (); -extern char PC; +/*extern char PC;*/ extern short ospeed; extern void tputs (); @ 1.10 log @Remove the now integrated patch changes and reduce the remaining patch with a shtool replacement, and finally update to 3.3.7 which seems to work with a new tarball off sourceforge @ text @d1 3 a3 299 diff -Naur ddd-3.3.1.orig/ddd/Agent.h ddd-3.3.1/ddd/Agent.h --- ddd-3.3.1.orig/ddd/Agent.h 1999-08-19 13:27:01.000000000 +0200 +++ ddd-3.3.1/ddd/Agent.h 2003-07-03 12:54:26.000000000 +0200 @@@@ -96,7 +96,7 @@@@ #include #include #include -#include +#include #include #include @@@@ -414,7 +414,7 @@@@ string name() const { - ostrstream os; + std::ostrstream os; os << path(); if (pid() > 0) os << " [" << pid() << "]"; diff -Naur ddd-3.3.1.orig/ddd/ArgNode.C ddd-3.3.1/ddd/ArgNode.C --- ddd-3.3.1.orig/ddd/ArgNode.C 1999-08-19 13:27:03.000000000 +0200 +++ ddd-3.3.1/ddd/ArgNode.C 2003-07-03 13:04:58.000000000 +0200 @@@@ -34,7 +34,7 @@@@ #endif -#include +#include #include "assert.h" #include "VSLLib.h" #include "ArgNode.h" @@@@ -61,7 +61,7 @@@@ if (box == 0) { - ostrstream os; + std::ostrstream os; os << "arg" << _id << " cannot be isolated"; VSLLib::eval_error(os); } @@@@ -70,13 +70,13 @@@@ } // Dump ArgNode -void ArgNode::dump(ostream& s) const +void ArgNode::dump(std::ostream& s) const { s << "arg" << _id; } // Dump as tree -void ArgNode::_dumpTree(ostream& s) const +void ArgNode::_dumpTree(std::ostream& s) const { s << _id; } diff -Naur ddd-3.3.1.orig/ddd/AsyncAgent.C ddd-3.3.1/ddd/AsyncAgent.C --- ddd-3.3.1.orig/ddd/AsyncAgent.C 1999-08-19 13:27:04.000000000 +0200 +++ ddd-3.3.1/ddd/AsyncAgent.C 2003-07-03 12:58:43.000000000 +0200 @@@@ -39,7 +39,7 @@@@ #include "misc.h" #include -#include +#include #include #include diff -Naur ddd-3.3.1.orig/ddd/DataDisp.C ddd-3.3.1/ddd/DataDisp.C --- ddd-3.3.1.orig/ddd/DataDisp.C 2001-04-26 13:08:06.000000000 +0200 +++ ddd-3.3.1/ddd/DataDisp.C 2003-07-03 13:16:46.000000000 +0200 @@@@ -2851,7 +2851,7 @@@@ // Set selection. // If the entire graph is selected, include position info, too. bool include_position = (count.selected >= count.visible); - ostrstream os; + std::ostrstream os; get_selection(os, include_position); string cmd(os); @@@@ -3742,7 +3742,7 @@@@ sort(clustered_displays); - ostrstream os; + std::ostrstream os; if (clustered_displays.size() == 0) { os << "No displays.\n"; @@@@ -4892,7 +4892,7 @@@@ bool unclustered = false; // Build undo command - ostrstream undo_commands; + std::ostrstream undo_commands; int i; for (i = 0; i < display_nrs.size(); i++) { diff -Naur ddd-3.3.1.orig/ddd/DefCallN.C ddd-3.3.1/ddd/DefCallN.C --- ddd-3.3.1.orig/ddd/DefCallN.C 2000-12-11 13:21:47.000000000 +0100 +++ ddd-3.3.1/ddd/DefCallN.C 2003-07-03 13:05:28.000000000 +0200 @@@@ -36,7 +36,7 @@@@ #include "assert.h" #include -#include +#include #include "VSLLib.h" #include "VSLDef.h" @@@@ -150,7 +150,7 @@@@ { const int bufsize = 1000; char buffer[bufsize]; - ostrstream s(buffer, sizeof buffer); + std::ostrstream s(buffer, sizeof buffer); s << *this << '\0'; VSLLib::eval_warning("no suitable definition for " + string(buffer), @@@@ -302,7 +302,7 @@@@ for (i = 0; i < _def->nargs(); i++) if (instances[i] > 0 && values[i] == 0) { - ostrstream os; + std::ostrstream os; os << "cannot isolate arg " << i; VSLLib::eval_warning(os, _def); fail = true; diff -Naur ddd-3.3.1.orig/ddd/DiagBox.C ddd-3.3.1/ddd/DiagBox.C --- ddd-3.3.1.orig/ddd/DiagBox.C 1999-08-19 13:27:20.000000000 +0200 +++ ddd-3.3.1/ddd/DiagBox.C 2003-07-03 13:03:34.000000000 +0200 @@@@ -34,7 +34,7 @@@@ #endif -#include +#include #include "PrimitiveB.h" #include "StringBox.h" @@@@ -66,7 +66,7 @@@@ origin[X], origin[Y] + i, origin[X] + space[X], origin[Y] + i); // Make space info - ostrstream oss; + std::ostrstream oss; ostream& os = oss; os << space << '\0'; string ss = oss; diff -Naur ddd-3.3.1.orig/ddd/DispBox.C ddd-3.3.1/ddd/DispBox.C --- ddd-3.3.1.orig/ddd/DispBox.C 2000-12-20 13:30:24.000000000 +0100 +++ ddd-3.3.1/ddd/DispBox.C 2003-07-03 13:27:50.000000000 +0200 @@@@ -152,7 +152,7 @@@@ "#line 1 \"" Ddd_NAME "*vslDefs\"\n" + vsllib_defs; - istrstream is(defs.chars()); + std::istrstream is(defs.chars()); vsllib_ptr = new ThemedVSLLib(is, VSEFlags::optimize_mode()); #else name = "vsllib/" ddd_NAME ".vsl"; @@@@ -168,7 +168,7 @@@@ "#line 1 \"" Ddd_NAME "*vslDefs\"\n" + vsllib_defs; - istrstream is(defs.chars()); + std::istrstream is(defs.chars()); vsllib_ptr->update(is); vsllib_ptr->optimize(VSEFlags::optimize_mode()); } diff -Naur ddd-3.3.1.orig/ddd/GraphEdit.C ddd-3.3.1/ddd/GraphEdit.C --- ddd-3.3.1.orig/ddd/GraphEdit.C 2001-04-26 13:08:06.000000000 +0200 +++ ddd-3.3.1/ddd/GraphEdit.C 2003-07-03 13:09:23.000000000 +0200 @@@@ -37,7 +37,7 @@@@ #include #include #include -#include +#include #include #include @@@@ -1053,7 +1053,7 @@@@ Dimension d = *((Dimension *)fromVal->addr); - ostrstream os; + std::ostrstream os; os << d; string os_s(os); String s = (String)XtNewString((String)os_s); @@@@ -1074,7 +1074,7 @@@@ Cardinal d = *((Cardinal *)fromVal->addr); - ostrstream os; + std::ostrstream os; os << d; string os_s(os); String s = (String)XtNewString((String)os_s); @@@@ -2884,7 +2884,7 @@@@ Layout::remove_graph(graph_name); // ... and re-rotate it. - ostrstream os; + std::ostrstream os; os << new_rotation; string rotation_s = os; diff -Naur ddd-3.3.1.orig/ddd/GraphNodeI.h ddd-3.3.1/ddd/GraphNodeI.h --- ddd-3.3.1.orig/ddd/GraphNodeI.h 2001-01-09 19:15:22.000000000 +0100 +++ ddd-3.3.1/ddd/GraphNodeI.h 2003-07-03 12:54:56.000000000 +0200 @@@@ -38,7 +38,7 @@@@ #include "Box.h" #include "bool.h" #include "GraphGC.h" -#include +#include class GraphEdge; class Graph; @@@@ -121,7 +121,7 @@@@ virtual const BoxRegion& sensitiveRegion(const GraphGC& gc) const = 0; virtual string str() const { - ostrstream os; + std::ostrstream os; os << id(); return string(os); } @@@@ -169,7 +169,7 @@@@ } // Printing - virtual void _print(ostream&, const GraphGC&) const + virtual void _print(std::ostream&, const GraphGC&) const { // Default: do nothing } @@@@ -178,7 +178,7 @@@@ virtual bool OK() const; }; -inline ostream& operator << (ostream& s, GraphNode& node) +inline std::ostream& operator << (std::ostream& s, GraphNode& node) { return s << node.str(); } diff -Naur ddd-3.3.1.orig/ddd/LetNode.C ddd-3.3.1/ddd/LetNode.C --- ddd-3.3.1.orig/ddd/LetNode.C 1999-08-19 13:27:37.000000000 +0200 +++ ddd-3.3.1/ddd/LetNode.C 2003-07-03 13:05:57.000000000 +0200 @@@@ -36,7 +36,7 @@@@ #include "assert.h" #include -#include +#include #include "VSLLib.h" @@@@ -278,13 +278,13 @@@@ { if (instances[i] == 0) { - ostrstream os; + std::ostrstream os; os << "invalid pattern: arg" << i << " is never instantiated"; VSLLib::eval_error(os); } if (instances[i] > 1) { - ostrstream os; + std::ostrstream os; os << "invalid pattern: arg" << i << " is instantiated several times"; VSLLib::eval_error(os); @@@@ -375,7 +375,7 @@@@ for (i = _base; i < _base + _nargs; i++) if (instances[i] > 0 && values[i] == 0) { - ostrstream os; + std::ostrstream os; os << "cannot isolate arg" << i; VSLLib::eval_warning(os, cdef); fail = true; diff -Naur ddd-3.3.1.orig/ddd/LiterateA.C ddd-3.3.1/ddd/LiterateA.C --- ddd-3.3.1.orig/ddd/LiterateA.C 2000-12-11 13:21:47.000000000 +0100 +++ ddd-3.3.1/ddd/LiterateA.C 2003-07-03 13:01:58.000000000 +0200 @@@@ -173,7 +173,7 @@@@ if (nitems == 0 && ++failures <= 3) { - ostrstream os; + std::ostrstream os; os << "write failed (attempt #" << failures << ", still trying)"; string s(os); d34 3 a36 3 diff -Naur ddd-3.3.7.orig/ddd/TTYAgent.C ddd-3.3.7/ddd/TTYAgent.C --- ddd-3.3.7.orig/ddd/TTYAgent.C Sat May 24 17:27:05 2003 +++ ddd-3.3.7/ddd/TTYAgent.C Mon Aug 4 12:55:45 2003 d57 16 a72 4 diff -Naur ddd-3.3.7.orig/libiberty/strsignal.c ddd-3.3.7/libiberty/strsignal.c --- ddd-3.3.7.orig/libiberty/strsignal.c Mon Mar 3 01:48:44 2003 +++ ddd-3.3.7/libiberty/strsignal.c Mon Aug 4 12:49:38 2003 @@@@ -236,6 +236,7 @@@@ d77 1 a77 1 #ifndef HAVE_SYS_SIGLIST d79 4 a82 4 static int sys_nsig; @@@@ -252,7 +253,8 @@@@ #endif extern const char * const sys_siglist[]; d90 4 a93 4 diff -Naur ddd-3.3.7.orig/libiberty/strerror.c ddd-3.3.7/libiberty/strerror.c --- ddd-3.3.7.orig/libiberty/strerror.c Mon Mar 3 01:48:43 2003 +++ ddd-3.3.7/libiberty/strerror.c Mon Aug 4 12:48:53 2003 @@@@ -455,6 +455,7 @@@@ d98 1 a98 1 #ifndef HAVE_SYS_ERRLIST d100 4 a103 4 static int sys_nerr; @@@@ -465,7 +466,8 @@@@ extern int sys_nerr; extern char *sys_errlist[]; d111 4 a114 777 diff -Naur ddd-3.3.1.orig/ddd/PlotAgent.C ddd-3.3.1/ddd/PlotAgent.C --- ddd-3.3.1.orig/ddd/PlotAgent.C 2001-03-26 18:40:05.000000000 +0200 +++ ddd-3.3.1/ddd/PlotAgent.C 2003-07-03 13:16:52.000000000 +0200 @@@@ -111,7 +111,7 @@@@ string PlotAgent::var(const char *name, double min, double max) { - ostrstream os; + std::ostrstream os; if (min < +DBL_MAX && max > -DBL_MAX) { @@@@ -139,7 +139,7 @@@@ else { // Issue plot command - ostrstream cmd; + std::ostrstream cmd; switch (ndim) { case 0: @@@@ -395,7 +395,7 @@@@ // Print plot to FILENAME void PlotAgent::print(const string& filename, const PrintGC& gc) { - ostrstream cmd; + std::ostrstream cmd; if (gc.isFig()) { diff -Naur ddd-3.3.1.orig/ddd/SourceView.C ddd-3.3.1/ddd/SourceView.C --- ddd-3.3.1.orig/ddd/SourceView.C 2001-04-26 13:08:06.000000000 +0200 +++ ddd-3.3.1/ddd/SourceView.C 2003-07-03 13:16:58.000000000 +0200 @@@@ -978,7 +978,7 @@@@ // Create a new breakpoint at ADDRESS, making it inherit the // current settings - ostrstream os; + std::ostrstream os; bool ok = bp->get_state(os, 0, false, address); if (!ok) return false; // Command failed @@@@ -1042,7 +1042,7 @@@@ { // Create a new breakpoint with a new condition COND, making it // inherit the current settings - ostrstream os; + std::ostrstream os; bool ok = bp->get_state(os, 0, false, "", c); if (!ok) continue; // Command failed @@@@ -3955,7 +3955,7 @@@@ bool changed = false; bool added = false; - ostrstream undo_commands; + std::ostrstream undo_commands; string file = current_file_name; while (info_output != "") @@@@ -4038,10 +4038,10 @@@@ bps_not_read -= bp_nr; BreakPoint *bp = bp_map.get(bp_nr); - ostrstream old_state; + std::ostrstream old_state; undo_buffer.add_breakpoint_state(old_state, bp); - ostrstream local_commands; + std::ostrstream local_commands; bool need_total_undo = false; bool bp_changed = diff -Naur ddd-3.3.1.orig/ddd/StringBox.C ddd-3.3.1/ddd/StringBox.C --- ddd-3.3.1.orig/ddd/StringBox.C 2000-12-11 13:21:47.000000000 +0100 +++ ddd-3.3.1/ddd/StringBox.C 2003-07-03 13:00:48.000000000 +0200 @@@@ -44,7 +44,7 @@@@ #include #include #include -#include +#include #include "VSEFlags.h" diff -Naur ddd-3.3.1.orig/ddd/Tool.C ddd-3.3.1/ddd/Tool.C --- ddd-3.3.1.orig/ddd/Tool.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/Tool.C 2003-07-03 13:17:12.000000000 +0200 @@@@ -143,7 +143,7 @@@@ Position pos_x, pos_y; get_transient_pos(XtScreen(tool_shell_parent), pos_x, pos_y); - ostrstream os; + std::ostrstream os; #if FIXED_COMMAND_TOOL os << size.width << "x" << size.height; #endif diff -Naur ddd-3.3.1.orig/ddd/VSEFlags.C ddd-3.3.1/ddd/VSEFlags.C --- ddd-3.3.1.orig/ddd/VSEFlags.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/VSEFlags.C 2003-07-03 13:06:28.000000000 +0200 @@@@ -32,7 +32,7 @@@@ #include #include #include -#include +#include #include #include @@@@ -594,7 +594,7 @@@@ if (intptr) { - ostrstream os; + std::ostrstream os; os << " (default: " << *intptr << ")"; deflt = string(os); } diff -Naur ddd-3.3.1.orig/ddd/VSLDef.C ddd-3.3.1/ddd/VSLDef.C --- ddd-3.3.1.orig/ddd/VSLDef.C 2000-06-06 21:40:19.000000000 +0200 +++ ddd-3.3.1/ddd/VSLDef.C 2003-07-03 13:07:18.000000000 +0200 @@@@ -36,7 +36,7 @@@@ #include -#include +#include #include #include "assert.h" @@@@ -257,14 +257,14 @@@@ { if (instances[i] == 0) { - ostrstream os; + std::ostrstream os; os << "invalid pattern: arg" << i << " is never instantiated"; VSLLib::eval_error(os, this); } if (instances[i] > 1) { - ostrstream os; + std::ostrstream os; os << "invalid pattern: arg" << i << " is instantiated several times"; VSLLib::eval_error(os, this); @@@@ -438,7 +438,7 @@@@ if ((deflist->func_name())[0] == '#') return string(""); - ostrstream os; + std::ostrstream os; if (_node_pattern->isArgNode()) os << "(" << *_node_pattern << "...)"; @@@@ -463,7 +463,7 @@@@ // External function name, including location string VSLDef::longname() const { - ostrstream os; + std::ostrstream os; ostream& s = os; if (_filename != "") diff -Naur ddd-3.3.1.orig/ddd/VSLDefList.C ddd-3.3.1/ddd/VSLDefList.C --- ddd-3.3.1.orig/ddd/VSLDefList.C 2000-12-19 01:21:47.000000000 +0100 +++ ddd-3.3.1/ddd/VSLDefList.C 2003-07-03 13:07:41.000000000 +0200 @@@@ -36,7 +36,7 @@@@ #include -#include +#include #include "assert.h" #include "VSEFlags.h" @@@@ -66,7 +66,7 @@@@ const int bufsize = 1000; char buffer[bufsize]; - ostrstream s(buffer, sizeof buffer); + std::ostrstream s(buffer, sizeof buffer); s << *arg << '\0'; VSLLib::eval_error("no suiting definition for " + f_name() + buffer); @@@@ -178,7 +178,7 @@@@ // Override void VSLDefList::override() { - ostrstream os; + std::ostrstream os; os << UniqueId(); _func_name += "'"; diff -Naur ddd-3.3.1.orig/ddd/VSLErr.C ddd-3.3.1/ddd/VSLErr.C --- ddd-3.3.1.orig/ddd/VSLErr.C 2000-06-19 19:13:21.000000000 +0200 +++ ddd-3.3.1/ddd/VSLErr.C 2003-07-03 13:07:57.000000000 +0200 @@@@ -30,7 +30,7 @@@@ "$Id: ddd.patch,v 1.9 2003/08/04 12:27:28 ms Exp $"; #include -#include +#include #include "strclass.h" #include "VSLLib.h" @@@@ -77,7 +77,7 @@@@ for (i--; i >= 0; i--) { - ostrstream os; + std::ostrstream os; os << i << " -- " << VSLDef::backtrace[i]->longname() << *VSLDef::backtrace_args[i]; diff -Naur ddd-3.3.1.orig/ddd/VSLRead.C ddd-3.3.1/ddd/VSLRead.C --- ddd-3.3.1.orig/ddd/VSLRead.C 2000-12-11 13:21:48.000000000 +0100 +++ ddd-3.3.1/ddd/VSLRead.C 2003-07-03 13:08:22.000000000 +0200 @@@@ -37,7 +37,7 @@@@ #include #include #include -#include +#include #include "assert.h" #include "strclass.h" @@@@ -187,7 +187,7 @@@@ // Parsing message void VSLLib::parse_echo(const string& msg) { - ostrstream os; + std::ostrstream os; ostream& s = os; if (vsllinenumber > 0) diff -Naur ddd-3.3.1.orig/ddd/cook.C ddd-3.3.1/ddd/cook.C --- ddd-3.3.1.orig/ddd/cook.C 2000-05-29 16:07:26.000000000 +0200 +++ ddd-3.3.1/ddd/cook.C 2003-07-03 12:56:54.000000000 +0200 @@@@ -34,7 +34,7 @@@@ #endif #include -#include +#include #include #include "bool.h" @@@@ -43,7 +43,7 @@@@ // Transform RAW into C string string _cook(const string& raw, bool for_postscript) { - ostrstream cooked; + std::ostrstream cooked; const char *raw_s = (char *)raw; for (unsigned i = 0; i < raw.length(); i++) @@@@ -189,7 +189,7 @@@@ // Transform COOKED into C string string uncook(const string& cooked) { - ostrstream uncooked; + std::ostrstream uncooked; int n; int count; diff -Naur ddd-3.3.1.orig/ddd/ddd.C ddd-3.3.1/ddd/ddd.C --- ddd-3.3.1.orig/ddd/ddd.C 2001-04-26 16:53:45.000000000 +0200 +++ ddd-3.3.1/ddd/ddd.C 2003-07-03 12:55:36.000000000 +0200 @@@@ -872,7 +872,7 @@@@ //----------------------------------------------------------------------------- struct RecentItems { - enum RecentItem { R1, R2, R3, R4, R5, R6, R7, R8, R9 }; + enum RecentItem { Re1, Re2, Re3, Re4, Re5, Re6, Re7, Re8, Re9 }; }; #define RECENT_MENU \ @@@@ -2030,7 +2030,7 @@@@ ddd_install_x_fatal(); ddd_install_x_error(); - ostrstream messages; + std::ostrstream messages; // Set up a `~/.ddd/' directory hierarchy create_session_dir(DEFAULT_SESSION, messages); @@@@ -3244,7 +3244,7 @@@@ // Check for expired versions if (ddd_expired()) { - ostrstream msg; + std::ostrstream msg; msg << "This " DDD_NAME " version (" DDD_VERSION ") has expired since " << ddd_expiration_date() << ".\n" << "Please upgrade to the recent " DDD_NAME " version."; @@@@ -3355,7 +3355,7 @@@@ // Install DDD log //----------------------------------------------------------------------------- -static ostrstream devnull; +static std::ostrstream devnull; ostream *_dddlog = &devnull; void init_dddlog() @@@@ -3748,7 +3748,7 @@@@ string geometry; if (lock_dialog_x >= 0 && lock_dialog_y >= 0) { - ostrstream os; + std::ostrstream os; os << "+" << lock_dialog_x << "+" << lock_dialog_y; geometry = string(os); XtSetArg(args[arg], XmNgeometry, geometry.chars()); arg++; @@@@ -5611,7 +5611,7 @@@@ static void report_languageHP(Agent *, void *, void *) { - ostrstream os; + std::ostrstream os; os << "Current language: " << gdb->program_language(); set_status(string(os)); } @@@@ -7209,7 +7209,7 @@@@ // `helpOnVersionString' resource. static void setup_version_info() { - ostrstream os; + std::ostrstream os; show_configuration(os); string cinfo(os); @@@@ -7653,7 +7653,7 @@@@ if (prefix.length() < 3) { // No prefix or insufficient prefix -- generate a new one - ostrstream key; + std::ostrstream key; key << ddd_NAME << "-" << getpid() << "-" << (long)time((time_t *)0) << ": "; prefix = key; diff -Naur ddd-3.3.1.orig/ddd/decoration.C ddd-3.3.1/ddd/decoration.C --- ddd-3.3.1.orig/ddd/decoration.C 2000-12-11 13:21:48.000000000 +0100 +++ ddd-3.3.1/ddd/decoration.C 2003-07-03 13:11:03.000000000 +0200 @@@@ -78,7 +78,7 @@@@ Position pos_x, pos_y; get_transient_pos(XtScreen(parent), pos_x, pos_y); - ostrstream os; + std::ostrstream os; os << "+" << pos_x << "+" << pos_y; string geometry(os); diff -Naur ddd-3.3.1.orig/ddd/exectty.C ddd-3.3.1/ddd/exectty.C --- ddd-3.3.1.orig/ddd/exectty.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/exectty.C 2003-07-03 13:12:17.000000000 +0200 @@@@ -216,7 +216,7 @@@@ { // We're already running. Don't start a new tty // if the old one is still running. - ostrstream os; + std::ostrstream os; os << "kill -2 " << pid << " 2>/dev/null" << " || ( " << command << " )"; command = string(os); @@@@ -237,7 +237,7 @@@@ if (reply.length() > 2) { - istrstream is((const char *)reply); + std::istrstream is((const char *)reply); is >> ttyname >> pid >> term >> windowid; } @@@@ -971,7 +971,7 @@@@ if (remote_gdb()) { - ostrstream os; + std::ostrstream os; os << "kill -" << SIGHUP << " " << separate_tty_pid << " >/dev/null &1 &"; Agent agent(sh_command(string(os))); diff -Naur ddd-3.3.1.orig/ddd/file.C ddd-3.3.1/ddd/file.C --- ddd-3.3.1.orig/ddd/file.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/file.C 2003-07-03 13:12:56.000000000 +0200 @@@@ -342,7 +342,7 @@@@ if (nitems == 1 || nitems % 10 == 0) { - ostrstream status; + std::ostrstream status; status << delay_message << "... (" << nitems << " processed)"; string s(status); @@@@ -449,7 +449,7 @@@@ int old_percent = ((i - 1) * 100) / count; if (percent % 10 == 0 && old_percent % 10 != 0) { - ostrstream status; + std::ostrstream status; status << delay_message << "... (" << percent << "% processed)"; string s(status); @@@@ -1115,7 +1115,7 @@@@ // Fix for Sun: use /usr/bin/kill string kill_result; { - ostrstream os; + std::ostrstream os; kill += " 2>&1"; FILE *fp = popen(kill.chars(), "r"); if (fp != 0) diff -Naur ddd-3.3.1.orig/ddd/gcore.C ddd-3.3.1/ddd/gcore.C --- ddd-3.3.1.orig/ddd/gcore.C 1999-08-19 13:28:36.000000000 +0200 +++ ddd-3.3.1/ddd/gcore.C 2003-07-03 13:17:20.000000000 +0200 @@@@ -109,7 +109,7 @@@@ for (; optind < argc; optind++) { int pid = atoi(argv[optind]); - ostrstream diag; + std::ostrstream diag; diag << "gcore: " << pid; string msg(diag); @@@@ -123,7 +123,7 @@@@ } // 2. Get a core file from the running process - ostrstream target; + std::ostrstream target; target << filename << "." << pid; string gcore_target(target); ok = ptrace(PTRACE_DUMPCORE, pid, diff -Naur ddd-3.3.1.orig/ddd/logplayer.C ddd-3.3.1/ddd/logplayer.C --- ddd-3.3.1.orig/ddd/logplayer.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/logplayer.C 2003-07-03 13:14:00.000000000 +0200 @@@@ -42,12 +42,14 @@@@ #include "config.h" #include "streampos.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include + +using std::ifstream; #include #include @@@@ -232,7 +234,7 @@@@ // Report line char buffer[256]; sprintf(buffer, "%4d", command_no); - ostrstream os; + std::ostrstream os; os << buffer << " " << in << "\n"; put(os); @@@@ -302,7 +304,7 @@@@ int line = 1; bool at_start_of_line = true; - ostrstream os; + std::ostrstream os; for (;;) { char c; @@@@ -332,7 +334,7 @@@@ if (!scanning && ddd_line == ".") { - ostrstream os; + std::ostrstream os; os << "Expecting " << command_no << " " << quote(in) << "\n"; put(os); diff -Naur ddd-3.3.1.orig/ddd/options.C ddd-3.3.1/ddd/options.C --- ddd-3.3.1.orig/ddd/options.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/options.C 2003-07-03 13:14:32.000000000 +0200 @@@@ -1529,7 +1529,7 @@@@ gcore.gsub("@@FILE@@", target); gcore.gsub("@@PID@@", itostring(info.pid)); string cmd = sh_command(gcore, true) + " 2>&1"; - ostrstream errs; + std::ostrstream errs; FILE *fp = popen(cmd, "r"); if (fp != 0) { @@@@ -1607,7 +1607,7 @@@@ // Kill the process, hopefully leaving a core file. // Since g77 catches SIGABRT, we disable its handler first. - ostrstream os; + std::ostrstream os; os << "signal(" << SIGABRT << ", " << (unsigned long)SIG_DFL << ")"; gdb_question(gdb->print_command(string(os))); @@@@ -2148,7 +2148,7 @@@@ XWindowAttributes attr; XGetWindowAttributes(XtDisplay(w), frame(w), &attr); - ostrstream geometry; + std::ostrstream geometry; if (include_size) geometry << width << "x" << height; geometry << "+" << attr.x << "+" << attr.y; @@@@ -2208,7 +2208,7 @@@@ } // Stream to hold data and breakpoints - ostrstream rs; + std::ostrstream rs; // Get breakpoints and cursor position bool breakpoints_ok = source_view->get_state(rs); @@@@ -2261,7 +2261,7 @@@@ } // Stream to hold exec and core file specs - ostrstream es; + std::ostrstream es; if (reload_file) { @@@@ -2589,7 +2589,7 @@@@ // Themes os << "\n! Themes.\n"; - ostrstream themes; + std::ostrstream themes; themes << DispBox::theme_manager; static string themes_s; themes_s = themes; diff -Naur ddd-3.3.1.orig/ddd/plotter.C ddd-3.3.1/ddd/plotter.C --- ddd-3.3.1.orig/ddd/plotter.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/plotter.C 2003-07-03 13:15:14.000000000 +0200 @@@@ -276,7 +276,7 @@@@ return; } - ostrstream s; + std::ostrstream s; int c; while ((c = is.get()) != EOF) s << (unsigned char)c; diff -Naur ddd-3.3.1.orig/ddd/session.C ddd-3.3.1/ddd/session.C --- ddd-3.3.1.orig/ddd/session.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/session.C 2003-07-03 13:17:25.000000000 +0200 @@@@ -312,7 +312,7 @@@@ // Same, but issue messages in status line void create_session_dir(const string& session) { - ostrstream messages; + std::ostrstream messages; create_session_dir(session, messages); string msg(messages); while (msg != "") diff -Naur ddd-3.3.1.orig/ddd/settings.C ddd-3.3.1/ddd/settings.C --- ddd-3.3.1.orig/ddd/settings.C 2001-04-30 09:55:19.000000000 +0200 +++ ddd-3.3.1/ddd/settings.C 2003-07-03 13:17:29.000000000 +0200 @@@@ -350,7 +350,7 @@@@ FILE *fp = popen(sh_command(cmd), "r"); if (fp != 0) { - ostrstream info; + std::ostrstream info; int c; while ((c = getc(fp)) != EOF) info << char(c); @@@@ -497,7 +497,7 @@@@ if (DispBox::theme_manager.has_pattern(theme)) p = DispBox::theme_manager.pattern(theme); - ostrstream os; + std::ostrstream os; os << p; string current_value = string(os); @@@@ -511,7 +511,7 @@@@ if (have_pattern) { ThemePattern p = old_tm.pattern(theme); - ostrstream os; + std::ostrstream os; os << p; old_value = string(os); } @@@@ -803,7 +803,7 @@@@ if (!init) { // Save current state in undo buffer - ostrstream command; + std::ostrstream command; get_setting(command, gdb->type(), XtName(button), settings_values[button]); undo_buffer.add_command(string(command)); @@@@ -2908,7 +2908,7 @@@@ set = DispBox::theme_manager.pattern(theme).active(); } - ostrstream os; + std::ostrstream os; os << p; string value = string(os); if (value == "") @@@@ -3162,7 +3162,7 @@@@ if (settings == 0) return ""; - ostrstream command; + std::ostrstream command; for (int i = 0; i < settings_entries.size(); i++) { Widget entry = settings_entries[i]; diff -Naur ddd-3.3.1.orig/ddd/show.C ddd-3.3.1/ddd/show.C --- ddd-3.3.1.orig/ddd/show.C 2001-04-26 16:17:19.000000000 +0200 +++ ddd-3.3.1/ddd/show.C 2003-07-03 13:17:36.000000000 +0200 @@@@ -471,7 +471,7 @@@@ } else { - ostrstream text; + std::ostrstream text; formatter(text); string s(text); @@@@ -531,7 +531,7 @@@@ { StatusMsg msg("Invoking " DDD_NAME " license browser"); - ostrstream license; + std::ostrstream license; int ret = ddd_license(license); string s(license); s.prepend("@@license@@"); @@@@ -571,7 +571,7 @@@@ { StatusMsg msg("Invoking " DDD_NAME " news browser"); - ostrstream news; + std::ostrstream news; int ret = ddd_news(news); string s(news); s.prepend("@@news@@"); @@@@ -625,7 +625,7 @@@@ { StatusMsg msg("Invoking " DDD_NAME " manual browser"); - ostrstream man; + std::ostrstream man; int ret = ddd_man(man); string s(man); @@@@ -664,7 +664,7 @@@@ FILE *fp = popen(sh_command(cmd), "r"); if (fp != 0) { - ostrstream man; + std::ostrstream man; int c; int i = 0; while ((c = getc(fp)) != EOF) diff -Naur ddd-3.3.1.orig/ddd/strclass.C ddd-3.3.1/ddd/strclass.C --- ddd-3.3.1.orig/ddd/strclass.C 2001-03-30 14:31:46.000000000 +0200 +++ ddd-3.3.1/ddd/strclass.C 2003-07-03 12:27:00.000000000 +0200 @@@@ -41,15 +41,17 @@@@ #include "strclass.h" #include "config.h" #include "return.h" -#include -#include -#include -#include +#include +#include +#include +#include #if HAVE_LIMITS_H -#include +#include #endif +using std::ifstream; + void string::error(const char* msg) const { cerr << "string: " << msg << "\n"; diff -Naur ddd-3.3.1.orig/ddd/strclass.h ddd-3.3.1/ddd/strclass.h --- ddd-3.3.1.orig/ddd/strclass.h 2000-12-20 13:30:25.000000000 +0100 +++ ddd-3.3.1/ddd/strclass.h 2003-07-03 12:50:02.000000000 +0200 @@@@ -410,7 +410,11 @@@@ #endif #include -#include +#include +#include +#include +#include +#include #include "rxclass.h" #include "config.h" #include "bool.h" @@@@ -540,7 +544,7 @@@@ string(const char* t); string(const char* t, int len); string(char c); - string(ostrstream& os); // should be const + string(std::ostrstream& os); // should be const ~string(); @@@@ -552,7 +556,7 @@@@ string& operator = (char* y); string& operator = (char c); string& operator = (const subString& y); - string& operator = (ostrstream& os); + string& operator = (std::ostrstream& os); // Concatenation string& operator += (const string& y); @@@@ -1046,7 +1050,7 @@@@ rep = string_Salloc(rep, &c, 1, 1); return *this; } -inline string& string::operator = (ostrstream& os) +inline string& string::operator = (std::ostrstream& os) { assert(!consuming()); @@@@ -1080,7 +1084,7 @@@@ return *this; } -inline string::string(ostrstream& os) +inline string::string(std::ostrstream& os) : rep(&_nilstrRep) #if STRING_CHECK_CONSUME , consume(false) diff -Naur ddd-3.3.1.orig/ddd/vsldoc.C ddd-3.3.1/ddd/vsldoc.C --- ddd-3.3.1.orig/ddd/vsldoc.C 2000-06-16 13:29:16.000000000 +0200 +++ ddd-3.3.1/ddd/vsldoc.C 2003-07-03 13:17:44.000000000 +0200 @@@@ -80,7 +80,7 @@@@ if (fp == 0) return ""; - ostrstream os; + std::ostrstream os; int c; while ((c = getc(fp)) != EOF) os << (char)c; diff -Naur ddd-3.3.1.orig/ddd/windows.C ddd-3.3.1/ddd/windows.C --- ddd-3.3.1.orig/ddd/windows.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/windows.C 2003-07-03 13:26:28.000000000 +0200 @@@@ -266,7 +266,7 @@@@ BoxPoint given_pos = pos + tool_shell_move_offset; - ostrstream os; + std::ostrstream os; os << "+" << given_pos[X] << "+" << given_pos[Y]; last_tool_shell_geometry = string(os); last_tool_shell_position = pos; diff -Naur ddd-3.3.1.orig/termcap/termcap.h ddd-3.3.1/termcap/termcap.h --- ddd-3.3.1.orig/termcap/termcap.h 1995-05-17 20:47:28.000000000 +0200 +++ ddd-3.3.1/termcap/termcap.h 2003-07-03 12:27:00.000000000 +0200 @@@@ -26,7 +26,6 @@@@ d119 1 d123 1 a123 1 @@@@ -45,7 +44,6 @@@@ d128 1 @ 1.9 log @Upgrade to older version, because unfortunately new does not work on FreeBSD. Also, add more patch code to better handle poor block device logic on FreeBSD. @ text @d594 1 a594 1 "$Id: ddd.patch,v 1.5 2003/07/03 11:49:05 ms Exp $"; @ 1.8 log @Patch to try to repair ddd runtime, and remove initial unavailable resources warnings from FreeBSD build @ text @d1 26 a26 19 diff -Naur ddd-3.3.7.orig/ddd/Ddd.in ddd-3.3.7/ddd/Ddd.in --- ddd-3.3.7.orig/ddd/Ddd.in Sat May 24 21:00:35 2003 +++ ddd-3.3.7/ddd/Ddd.in Mon Aug 4 12:46:23 2003 @@@@ -649,9 +649,6 @@@@ ! The Perl Debugger settings. Usually overridden in `~/.@@ddd@@/init'. @@Ddd@@*perlSettings: -@@Ddd@@*bashInitCommands: \ - set prompt bashdb$_Dbg_less$_Dbg_greater$_Dbg_space\n\ - ! The Bash Debugger settings. Usually overridden in `~/.@@ddd@@/init'. @@Ddd@@*bashSettings: diff -Naur ddd-3.3.7.orig/ddd/DispBox.C ddd-3.3.7/ddd/DispBox.C --- ddd-3.3.7.orig/ddd/DispBox.C Sat May 24 17:27:02 2003 +++ ddd-3.3.7/ddd/DispBox.C Mon Aug 4 12:46:23 2003 @@@@ -59,7 +59,9 @@@@ #include "regexps.h" #include "resolveP.h" d28 81 a108 2 -#include +#include a109 1 +#include d111 26 a136 1 #define assert_ok(x) assert(x) d138 18 a155 1 @@@@ -152,7 +154,7 @@@@ d164 136 a299 3 diff -Naur ddd-3.3.7.orig/ddd/LiterateA.C ddd-3.3.7/ddd/LiterateA.C --- ddd-3.3.7.orig/ddd/LiterateA.C Sat May 24 17:27:03 2003 +++ ddd-3.3.7/ddd/LiterateA.C Mon Aug 4 12:53:16 2003 a329 15 diff -Naur ddd-3.3.7.orig/ddd/PannedGE.C ddd-3.3.7/ddd/PannedGE.C --- ddd-3.3.7.orig/ddd/PannedGE.C Sat May 24 17:27:04 2003 +++ ddd-3.3.7/ddd/PannedGE.C Mon Aug 4 12:46:23 2003 @@@@ -395,9 +395,9 @@@@ static bool warned = false; if (!warned) { - cerr << "Warning: panned graph editors are not supported " + std::cerr << "Warning: panned graph editors are not supported " "in this configuration.\n"; - cerr << "Using scrolled graph editors instead.\n"; + std::cerr << "Using scrolled graph editors instead.\n"; warned = true; } d353 18 a370 5 diff -Naur ddd-3.3.7.orig/ddd/ddd.C ddd-3.3.7/ddd/ddd.C --- ddd-3.3.7.orig/ddd/ddd.C Sat May 24 17:27:06 2003 +++ ddd-3.3.7/ddd/ddd.C Mon Aug 4 12:46:23 2003 @@@@ -883,7 +883,7 @@@@ //----------------------------------------------------------------------------- a371 4 struct RecentItems { - enum RecentItem { R1, R2, R3, R4, R5, R6, R7, R8, R9 }; + enum RecentItem { Re1, Re2, Re3, Re4, Re5, Re6, Re7, Re8, Re9 }; }; d373 1 a373 1 #define RECENT_MENU \ d395 208 a602 6 diff -Naur ddd-3.3.7.orig/libiberty/strsignal.c ddd-3.3.7/libiberty/strsignal.c --- ddd-3.3.7.orig/libiberty/strsignal.c Mon Mar 3 01:48:44 2003 +++ ddd-3.3.7/libiberty/strsignal.c Mon Aug 4 12:49:38 2003 @@@@ -236,6 +236,7 @@@@ same name, it differs from other implementations in that it is dynamically initialized rather than statically initialized. */ d604 16 a619 2 +#ifndef __FreeBSD__ #ifndef HAVE_SYS_SIGLIST d621 15 a635 2 static int sys_nsig; @@@@ -252,7 +253,8 @@@@ a636 1 extern const char * const sys_siglist[]; d638 448 a1085 3 -#endif +#endif /* #ifndef HAVE_SYS_ERRLIST */ +#endif /* #ifndef __FreeBSD__ */ d1087 10 d1098 73 a1170 4 /* diff -Naur ddd-3.3.7.orig/termcap/termcap.h ddd-3.3.7/termcap/termcap.h --- ddd-3.3.7.orig/termcap/termcap.h Mon Mar 3 01:49:15 2003 +++ ddd-3.3.7/termcap/termcap.h Mon Aug 4 12:46:23 2003 d1179 8 @ 1.7 log @Fix packaging of NEWS and LICENSE, and patch nonstandard source code some more @ text @d1 69 d72 1 a72 1 +++ ddd-3.3.7/ddd/PannedGE.C Fri Aug 1 12:09:16 2003 d85 23 d109 2 a110 2 --- ddd-3.3.7.orig/ddd/ddd.C 2003-05-24 17:27:06.000000000 +0200 +++ ddd-3.3.7/ddd/ddd.C 2003-08-01 07:59:08.677245000 +0200 d120 42 d163 2 a164 2 --- ddd-3.3.7.orig/termcap/termcap.h 2003-03-03 01:49:15.000000000 +0100 +++ ddd-3.3.7/termcap/termcap.h 2003-08-01 08:10:11.616917000 +0200 a171 36 diff -Naur ddd-3.3.7.orig/ddd/DispBox.C ddd-3.3.7/ddd/DispBox.C --- ddd-3.3.7.orig/ddd/DispBox.C Sat May 24 17:27:02 2003 +++ ddd-3.3.7/ddd/DispBox.C Fri Aug 1 15:49:30 2003 @@@@ -59,7 +59,9 @@@@ #include "regexps.h" #include "resolveP.h" -#include +#include +#include +#include #define assert_ok(x) assert(x) @@@@ -152,7 +154,7 @@@@ "#line 1 \"" Ddd_NAME "*vslDefs\"\n" + vsllib_defs; - istrstream is(defs.chars()); + std::istrstream is(defs.chars()); vsllib_ptr = new ThemedVSLLib(is, VSEFlags::optimize_mode()); #else name = "vsllib/" ddd_NAME ".vsl"; diff -Naur ddd-3.3.7.orig/ddd/Ddd.in ddd-3.3.7/ddd/Ddd.in --- ddd-3.3.7.orig/ddd/Ddd.in Sat May 24 21:00:35 2003 +++ ddd-3.3.7/ddd/Ddd.in Fri Aug 1 15:43:54 2003 @@@@ -649,9 +649,6 @@@@ ! The Perl Debugger settings. Usually overridden in `~/.@@ddd@@/init'. @@Ddd@@*perlSettings: -@@Ddd@@*bashInitCommands: \ - set prompt bashdb$_Dbg_less$_Dbg_greater$_Dbg_space\n\ - ! The Bash Debugger settings. Usually overridden in `~/.@@ddd@@/init'. @@Ddd@@*bashSettings: @ 1.6 log @upgrading package: ddd 3.3.1 -> 3.3.7 @ text @d39 36 @ 1.5 log @Patch the crap out of this piece, because it is years behind current ISO C++ standards @ text @d1 19 a19 570 diff -Naur ddd-3.3.1.orig/ddd/Agent.h ddd-3.3.1/ddd/Agent.h --- ddd-3.3.1.orig/ddd/Agent.h 1999-08-19 13:27:01.000000000 +0200 +++ ddd-3.3.1/ddd/Agent.h 2003-07-03 12:54:26.000000000 +0200 @@@@ -96,7 +96,7 @@@@ #include #include #include -#include +#include #include #include @@@@ -414,7 +414,7 @@@@ string name() const { - ostrstream os; + std::ostrstream os; os << path(); if (pid() > 0) os << " [" << pid() << "]"; diff -Naur ddd-3.3.1.orig/ddd/ArgNode.C ddd-3.3.1/ddd/ArgNode.C --- ddd-3.3.1.orig/ddd/ArgNode.C 1999-08-19 13:27:03.000000000 +0200 +++ ddd-3.3.1/ddd/ArgNode.C 2003-07-03 13:04:58.000000000 +0200 @@@@ -34,7 +34,7 @@@@ #endif -#include +#include #include "assert.h" #include "VSLLib.h" #include "ArgNode.h" @@@@ -61,7 +61,7 @@@@ if (box == 0) { - ostrstream os; + std::ostrstream os; os << "arg" << _id << " cannot be isolated"; VSLLib::eval_error(os); } @@@@ -70,13 +70,13 @@@@ } // Dump ArgNode -void ArgNode::dump(ostream& s) const +void ArgNode::dump(std::ostream& s) const { s << "arg" << _id; } // Dump as tree -void ArgNode::_dumpTree(ostream& s) const +void ArgNode::_dumpTree(std::ostream& s) const { s << _id; } diff -Naur ddd-3.3.1.orig/ddd/AsyncAgent.C ddd-3.3.1/ddd/AsyncAgent.C --- ddd-3.3.1.orig/ddd/AsyncAgent.C 1999-08-19 13:27:04.000000000 +0200 +++ ddd-3.3.1/ddd/AsyncAgent.C 2003-07-03 12:58:43.000000000 +0200 @@@@ -39,7 +39,7 @@@@ #include "misc.h" #include -#include +#include #include #include diff -Naur ddd-3.3.1.orig/ddd/DataDisp.C ddd-3.3.1/ddd/DataDisp.C --- ddd-3.3.1.orig/ddd/DataDisp.C 2001-04-26 13:08:06.000000000 +0200 +++ ddd-3.3.1/ddd/DataDisp.C 2003-07-03 13:16:46.000000000 +0200 @@@@ -2851,7 +2851,7 @@@@ // Set selection. // If the entire graph is selected, include position info, too. bool include_position = (count.selected >= count.visible); - ostrstream os; + std::ostrstream os; get_selection(os, include_position); string cmd(os); @@@@ -3742,7 +3742,7 @@@@ sort(clustered_displays); - ostrstream os; + std::ostrstream os; if (clustered_displays.size() == 0) { os << "No displays.\n"; @@@@ -4892,7 +4892,7 @@@@ bool unclustered = false; // Build undo command - ostrstream undo_commands; + std::ostrstream undo_commands; int i; for (i = 0; i < display_nrs.size(); i++) { diff -Naur ddd-3.3.1.orig/ddd/DefCallN.C ddd-3.3.1/ddd/DefCallN.C --- ddd-3.3.1.orig/ddd/DefCallN.C 2000-12-11 13:21:47.000000000 +0100 +++ ddd-3.3.1/ddd/DefCallN.C 2003-07-03 13:05:28.000000000 +0200 @@@@ -36,7 +36,7 @@@@ #include "assert.h" #include -#include +#include #include "VSLLib.h" #include "VSLDef.h" @@@@ -150,7 +150,7 @@@@ { const int bufsize = 1000; char buffer[bufsize]; - ostrstream s(buffer, sizeof buffer); + std::ostrstream s(buffer, sizeof buffer); s << *this << '\0'; VSLLib::eval_warning("no suitable definition for " + string(buffer), @@@@ -302,7 +302,7 @@@@ for (i = 0; i < _def->nargs(); i++) if (instances[i] > 0 && values[i] == 0) { - ostrstream os; + std::ostrstream os; os << "cannot isolate arg " << i; VSLLib::eval_warning(os, _def); fail = true; diff -Naur ddd-3.3.1.orig/ddd/DiagBox.C ddd-3.3.1/ddd/DiagBox.C --- ddd-3.3.1.orig/ddd/DiagBox.C 1999-08-19 13:27:20.000000000 +0200 +++ ddd-3.3.1/ddd/DiagBox.C 2003-07-03 13:03:34.000000000 +0200 @@@@ -34,7 +34,7 @@@@ #endif -#include +#include #include "PrimitiveB.h" #include "StringBox.h" @@@@ -66,7 +66,7 @@@@ origin[X], origin[Y] + i, origin[X] + space[X], origin[Y] + i); // Make space info - ostrstream oss; + std::ostrstream oss; ostream& os = oss; os << space << '\0'; string ss = oss; diff -Naur ddd-3.3.1.orig/ddd/DispBox.C ddd-3.3.1/ddd/DispBox.C --- ddd-3.3.1.orig/ddd/DispBox.C 2000-12-20 13:30:24.000000000 +0100 +++ ddd-3.3.1/ddd/DispBox.C 2003-07-03 13:27:50.000000000 +0200 @@@@ -152,7 +152,7 @@@@ "#line 1 \"" Ddd_NAME "*vslDefs\"\n" + vsllib_defs; - istrstream is(defs.chars()); + std::istrstream is(defs.chars()); vsllib_ptr = new ThemedVSLLib(is, VSEFlags::optimize_mode()); #else name = "vsllib/" ddd_NAME ".vsl"; @@@@ -168,7 +168,7 @@@@ "#line 1 \"" Ddd_NAME "*vslDefs\"\n" + vsllib_defs; - istrstream is(defs.chars()); + std::istrstream is(defs.chars()); vsllib_ptr->update(is); vsllib_ptr->optimize(VSEFlags::optimize_mode()); } diff -Naur ddd-3.3.1.orig/ddd/GraphEdit.C ddd-3.3.1/ddd/GraphEdit.C --- ddd-3.3.1.orig/ddd/GraphEdit.C 2001-04-26 13:08:06.000000000 +0200 +++ ddd-3.3.1/ddd/GraphEdit.C 2003-07-03 13:09:23.000000000 +0200 @@@@ -37,7 +37,7 @@@@ #include #include #include -#include +#include #include #include @@@@ -1053,7 +1053,7 @@@@ Dimension d = *((Dimension *)fromVal->addr); - ostrstream os; + std::ostrstream os; os << d; string os_s(os); String s = (String)XtNewString((String)os_s); @@@@ -1074,7 +1074,7 @@@@ Cardinal d = *((Cardinal *)fromVal->addr); - ostrstream os; + std::ostrstream os; os << d; string os_s(os); String s = (String)XtNewString((String)os_s); @@@@ -2884,7 +2884,7 @@@@ Layout::remove_graph(graph_name); // ... and re-rotate it. - ostrstream os; + std::ostrstream os; os << new_rotation; string rotation_s = os; diff -Naur ddd-3.3.1.orig/ddd/GraphNodeI.h ddd-3.3.1/ddd/GraphNodeI.h --- ddd-3.3.1.orig/ddd/GraphNodeI.h 2001-01-09 19:15:22.000000000 +0100 +++ ddd-3.3.1/ddd/GraphNodeI.h 2003-07-03 12:54:56.000000000 +0200 @@@@ -38,7 +38,7 @@@@ #include "Box.h" #include "bool.h" #include "GraphGC.h" -#include +#include class GraphEdge; class Graph; @@@@ -121,7 +121,7 @@@@ virtual const BoxRegion& sensitiveRegion(const GraphGC& gc) const = 0; virtual string str() const { - ostrstream os; + std::ostrstream os; os << id(); return string(os); } @@@@ -169,7 +169,7 @@@@ } // Printing - virtual void _print(ostream&, const GraphGC&) const + virtual void _print(std::ostream&, const GraphGC&) const { // Default: do nothing } @@@@ -178,7 +178,7 @@@@ virtual bool OK() const; }; -inline ostream& operator << (ostream& s, GraphNode& node) +inline std::ostream& operator << (std::ostream& s, GraphNode& node) { return s << node.str(); } diff -Naur ddd-3.3.1.orig/ddd/LetNode.C ddd-3.3.1/ddd/LetNode.C --- ddd-3.3.1.orig/ddd/LetNode.C 1999-08-19 13:27:37.000000000 +0200 +++ ddd-3.3.1/ddd/LetNode.C 2003-07-03 13:05:57.000000000 +0200 @@@@ -36,7 +36,7 @@@@ #include "assert.h" #include -#include +#include #include "VSLLib.h" @@@@ -278,13 +278,13 @@@@ { if (instances[i] == 0) { - ostrstream os; + std::ostrstream os; os << "invalid pattern: arg" << i << " is never instantiated"; VSLLib::eval_error(os); } if (instances[i] > 1) { - ostrstream os; + std::ostrstream os; os << "invalid pattern: arg" << i << " is instantiated several times"; VSLLib::eval_error(os); @@@@ -375,7 +375,7 @@@@ for (i = _base; i < _base + _nargs; i++) if (instances[i] > 0 && values[i] == 0) { - ostrstream os; + std::ostrstream os; os << "cannot isolate arg" << i; VSLLib::eval_warning(os, cdef); fail = true; diff -Naur ddd-3.3.1.orig/ddd/LiterateA.C ddd-3.3.1/ddd/LiterateA.C --- ddd-3.3.1.orig/ddd/LiterateA.C 2000-12-11 13:21:47.000000000 +0100 +++ ddd-3.3.1/ddd/LiterateA.C 2003-07-03 13:01:58.000000000 +0200 @@@@ -173,7 +173,7 @@@@ if (nitems == 0 && ++failures <= 3) { - ostrstream os; + std::ostrstream os; os << "write failed (attempt #" << failures << ", still trying)"; string s(os); diff -Naur ddd-3.3.1.orig/ddd/PlotAgent.C ddd-3.3.1/ddd/PlotAgent.C --- ddd-3.3.1.orig/ddd/PlotAgent.C 2001-03-26 18:40:05.000000000 +0200 +++ ddd-3.3.1/ddd/PlotAgent.C 2003-07-03 13:16:52.000000000 +0200 @@@@ -111,7 +111,7 @@@@ string PlotAgent::var(const char *name, double min, double max) { - ostrstream os; + std::ostrstream os; if (min < +DBL_MAX && max > -DBL_MAX) { @@@@ -139,7 +139,7 @@@@ else { // Issue plot command - ostrstream cmd; + std::ostrstream cmd; switch (ndim) { case 0: @@@@ -395,7 +395,7 @@@@ // Print plot to FILENAME void PlotAgent::print(const string& filename, const PrintGC& gc) { - ostrstream cmd; + std::ostrstream cmd; if (gc.isFig()) { diff -Naur ddd-3.3.1.orig/ddd/SourceView.C ddd-3.3.1/ddd/SourceView.C --- ddd-3.3.1.orig/ddd/SourceView.C 2001-04-26 13:08:06.000000000 +0200 +++ ddd-3.3.1/ddd/SourceView.C 2003-07-03 13:16:58.000000000 +0200 @@@@ -978,7 +978,7 @@@@ // Create a new breakpoint at ADDRESS, making it inherit the // current settings - ostrstream os; + std::ostrstream os; bool ok = bp->get_state(os, 0, false, address); if (!ok) return false; // Command failed @@@@ -1042,7 +1042,7 @@@@ { // Create a new breakpoint with a new condition COND, making it // inherit the current settings - ostrstream os; + std::ostrstream os; bool ok = bp->get_state(os, 0, false, "", c); if (!ok) continue; // Command failed @@@@ -3955,7 +3955,7 @@@@ bool changed = false; bool added = false; - ostrstream undo_commands; + std::ostrstream undo_commands; string file = current_file_name; while (info_output != "") @@@@ -4038,10 +4038,10 @@@@ bps_not_read -= bp_nr; BreakPoint *bp = bp_map.get(bp_nr); - ostrstream old_state; + std::ostrstream old_state; undo_buffer.add_breakpoint_state(old_state, bp); - ostrstream local_commands; + std::ostrstream local_commands; bool need_total_undo = false; bool bp_changed = diff -Naur ddd-3.3.1.orig/ddd/StringBox.C ddd-3.3.1/ddd/StringBox.C --- ddd-3.3.1.orig/ddd/StringBox.C 2000-12-11 13:21:47.000000000 +0100 +++ ddd-3.3.1/ddd/StringBox.C 2003-07-03 13:00:48.000000000 +0200 @@@@ -44,7 +44,7 @@@@ #include #include #include -#include +#include #include "VSEFlags.h" diff -Naur ddd-3.3.1.orig/ddd/Tool.C ddd-3.3.1/ddd/Tool.C --- ddd-3.3.1.orig/ddd/Tool.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/Tool.C 2003-07-03 13:17:12.000000000 +0200 @@@@ -143,7 +143,7 @@@@ Position pos_x, pos_y; get_transient_pos(XtScreen(tool_shell_parent), pos_x, pos_y); - ostrstream os; + std::ostrstream os; #if FIXED_COMMAND_TOOL os << size.width << "x" << size.height; #endif diff -Naur ddd-3.3.1.orig/ddd/VSEFlags.C ddd-3.3.1/ddd/VSEFlags.C --- ddd-3.3.1.orig/ddd/VSEFlags.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/VSEFlags.C 2003-07-03 13:06:28.000000000 +0200 @@@@ -32,7 +32,7 @@@@ #include #include #include -#include +#include #include #include @@@@ -594,7 +594,7 @@@@ if (intptr) { - ostrstream os; + std::ostrstream os; os << " (default: " << *intptr << ")"; deflt = string(os); } diff -Naur ddd-3.3.1.orig/ddd/VSLDef.C ddd-3.3.1/ddd/VSLDef.C --- ddd-3.3.1.orig/ddd/VSLDef.C 2000-06-06 21:40:19.000000000 +0200 +++ ddd-3.3.1/ddd/VSLDef.C 2003-07-03 13:07:18.000000000 +0200 @@@@ -36,7 +36,7 @@@@ #include -#include +#include #include #include "assert.h" @@@@ -257,14 +257,14 @@@@ { if (instances[i] == 0) { - ostrstream os; + std::ostrstream os; os << "invalid pattern: arg" << i << " is never instantiated"; VSLLib::eval_error(os, this); } if (instances[i] > 1) { - ostrstream os; + std::ostrstream os; os << "invalid pattern: arg" << i << " is instantiated several times"; VSLLib::eval_error(os, this); @@@@ -438,7 +438,7 @@@@ if ((deflist->func_name())[0] == '#') return string(""); - ostrstream os; + std::ostrstream os; if (_node_pattern->isArgNode()) os << "(" << *_node_pattern << "...)"; @@@@ -463,7 +463,7 @@@@ // External function name, including location string VSLDef::longname() const { - ostrstream os; + std::ostrstream os; ostream& s = os; if (_filename != "") diff -Naur ddd-3.3.1.orig/ddd/VSLDefList.C ddd-3.3.1/ddd/VSLDefList.C --- ddd-3.3.1.orig/ddd/VSLDefList.C 2000-12-19 01:21:47.000000000 +0100 +++ ddd-3.3.1/ddd/VSLDefList.C 2003-07-03 13:07:41.000000000 +0200 @@@@ -36,7 +36,7 @@@@ #include -#include +#include #include "assert.h" #include "VSEFlags.h" @@@@ -66,7 +66,7 @@@@ const int bufsize = 1000; char buffer[bufsize]; - ostrstream s(buffer, sizeof buffer); + std::ostrstream s(buffer, sizeof buffer); s << *arg << '\0'; VSLLib::eval_error("no suiting definition for " + f_name() + buffer); @@@@ -178,7 +178,7 @@@@ // Override void VSLDefList::override() { - ostrstream os; + std::ostrstream os; os << UniqueId(); _func_name += "'"; diff -Naur ddd-3.3.1.orig/ddd/VSLErr.C ddd-3.3.1/ddd/VSLErr.C --- ddd-3.3.1.orig/ddd/VSLErr.C 2000-06-19 19:13:21.000000000 +0200 +++ ddd-3.3.1/ddd/VSLErr.C 2003-07-03 13:07:57.000000000 +0200 @@@@ -30,7 +30,7 @@@@ "$Id: VSLErr.C,v 1.13 2000/06/19 17:13:21 andreas Exp $"; #include -#include +#include #include "strclass.h" #include "VSLLib.h" @@@@ -77,7 +77,7 @@@@ for (i--; i >= 0; i--) { - ostrstream os; + std::ostrstream os; os << i << " -- " << VSLDef::backtrace[i]->longname() << *VSLDef::backtrace_args[i]; diff -Naur ddd-3.3.1.orig/ddd/VSLRead.C ddd-3.3.1/ddd/VSLRead.C --- ddd-3.3.1.orig/ddd/VSLRead.C 2000-12-11 13:21:48.000000000 +0100 +++ ddd-3.3.1/ddd/VSLRead.C 2003-07-03 13:08:22.000000000 +0200 @@@@ -37,7 +37,7 @@@@ #include #include #include -#include +#include #include "assert.h" #include "strclass.h" @@@@ -187,7 +187,7 @@@@ // Parsing message void VSLLib::parse_echo(const string& msg) { - ostrstream os; + std::ostrstream os; ostream& s = os; if (vsllinenumber > 0) diff -Naur ddd-3.3.1.orig/ddd/cook.C ddd-3.3.1/ddd/cook.C --- ddd-3.3.1.orig/ddd/cook.C 2000-05-29 16:07:26.000000000 +0200 +++ ddd-3.3.1/ddd/cook.C 2003-07-03 12:56:54.000000000 +0200 @@@@ -34,7 +34,7 @@@@ #endif #include -#include +#include #include #include "bool.h" @@@@ -43,7 +43,7 @@@@ // Transform RAW into C string string _cook(const string& raw, bool for_postscript) { - ostrstream cooked; + std::ostrstream cooked; const char *raw_s = (char *)raw; for (unsigned i = 0; i < raw.length(); i++) @@@@ -189,7 +189,7 @@@@ // Transform COOKED into C string string uncook(const string& cooked) { - ostrstream uncooked; + std::ostrstream uncooked; int n; int count; diff -Naur ddd-3.3.1.orig/ddd/ddd.C ddd-3.3.1/ddd/ddd.C --- ddd-3.3.1.orig/ddd/ddd.C 2001-04-26 16:53:45.000000000 +0200 +++ ddd-3.3.1/ddd/ddd.C 2003-07-03 12:55:36.000000000 +0200 @@@@ -872,7 +872,7 @@@@ d28 3 a30 497 @@@@ -2030,7 +2030,7 @@@@ ddd_install_x_fatal(); ddd_install_x_error(); - ostrstream messages; + std::ostrstream messages; // Set up a `~/.ddd/' directory hierarchy create_session_dir(DEFAULT_SESSION, messages); @@@@ -3244,7 +3244,7 @@@@ // Check for expired versions if (ddd_expired()) { - ostrstream msg; + std::ostrstream msg; msg << "This " DDD_NAME " version (" DDD_VERSION ") has expired since " << ddd_expiration_date() << ".\n" << "Please upgrade to the recent " DDD_NAME " version."; @@@@ -3355,7 +3355,7 @@@@ // Install DDD log //----------------------------------------------------------------------------- -static ostrstream devnull; +static std::ostrstream devnull; ostream *_dddlog = &devnull; void init_dddlog() @@@@ -3748,7 +3748,7 @@@@ string geometry; if (lock_dialog_x >= 0 && lock_dialog_y >= 0) { - ostrstream os; + std::ostrstream os; os << "+" << lock_dialog_x << "+" << lock_dialog_y; geometry = string(os); XtSetArg(args[arg], XmNgeometry, geometry.chars()); arg++; @@@@ -5611,7 +5611,7 @@@@ static void report_languageHP(Agent *, void *, void *) { - ostrstream os; + std::ostrstream os; os << "Current language: " << gdb->program_language(); set_status(string(os)); } @@@@ -7209,7 +7209,7 @@@@ // `helpOnVersionString' resource. static void setup_version_info() { - ostrstream os; + std::ostrstream os; show_configuration(os); string cinfo(os); @@@@ -7653,7 +7653,7 @@@@ if (prefix.length() < 3) { // No prefix or insufficient prefix -- generate a new one - ostrstream key; + std::ostrstream key; key << ddd_NAME << "-" << getpid() << "-" << (long)time((time_t *)0) << ": "; prefix = key; diff -Naur ddd-3.3.1.orig/ddd/decoration.C ddd-3.3.1/ddd/decoration.C --- ddd-3.3.1.orig/ddd/decoration.C 2000-12-11 13:21:48.000000000 +0100 +++ ddd-3.3.1/ddd/decoration.C 2003-07-03 13:11:03.000000000 +0200 @@@@ -78,7 +78,7 @@@@ Position pos_x, pos_y; get_transient_pos(XtScreen(parent), pos_x, pos_y); - ostrstream os; + std::ostrstream os; os << "+" << pos_x << "+" << pos_y; string geometry(os); diff -Naur ddd-3.3.1.orig/ddd/exectty.C ddd-3.3.1/ddd/exectty.C --- ddd-3.3.1.orig/ddd/exectty.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/exectty.C 2003-07-03 13:12:17.000000000 +0200 @@@@ -216,7 +216,7 @@@@ { // We're already running. Don't start a new tty // if the old one is still running. - ostrstream os; + std::ostrstream os; os << "kill -2 " << pid << " 2>/dev/null" << " || ( " << command << " )"; command = string(os); @@@@ -237,7 +237,7 @@@@ if (reply.length() > 2) { - istrstream is((const char *)reply); + std::istrstream is((const char *)reply); is >> ttyname >> pid >> term >> windowid; } @@@@ -971,7 +971,7 @@@@ if (remote_gdb()) { - ostrstream os; + std::ostrstream os; os << "kill -" << SIGHUP << " " << separate_tty_pid << " >/dev/null &1 &"; Agent agent(sh_command(string(os))); diff -Naur ddd-3.3.1.orig/ddd/file.C ddd-3.3.1/ddd/file.C --- ddd-3.3.1.orig/ddd/file.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/file.C 2003-07-03 13:12:56.000000000 +0200 @@@@ -342,7 +342,7 @@@@ if (nitems == 1 || nitems % 10 == 0) { - ostrstream status; + std::ostrstream status; status << delay_message << "... (" << nitems << " processed)"; string s(status); @@@@ -449,7 +449,7 @@@@ int old_percent = ((i - 1) * 100) / count; if (percent % 10 == 0 && old_percent % 10 != 0) { - ostrstream status; + std::ostrstream status; status << delay_message << "... (" << percent << "% processed)"; string s(status); @@@@ -1115,7 +1115,7 @@@@ // Fix for Sun: use /usr/bin/kill string kill_result; { - ostrstream os; + std::ostrstream os; kill += " 2>&1"; FILE *fp = popen(kill.chars(), "r"); if (fp != 0) diff -Naur ddd-3.3.1.orig/ddd/gcore.C ddd-3.3.1/ddd/gcore.C --- ddd-3.3.1.orig/ddd/gcore.C 1999-08-19 13:28:36.000000000 +0200 +++ ddd-3.3.1/ddd/gcore.C 2003-07-03 13:17:20.000000000 +0200 @@@@ -109,7 +109,7 @@@@ for (; optind < argc; optind++) { int pid = atoi(argv[optind]); - ostrstream diag; + std::ostrstream diag; diag << "gcore: " << pid; string msg(diag); @@@@ -123,7 +123,7 @@@@ } // 2. Get a core file from the running process - ostrstream target; + std::ostrstream target; target << filename << "." << pid; string gcore_target(target); ok = ptrace(PTRACE_DUMPCORE, pid, diff -Naur ddd-3.3.1.orig/ddd/logplayer.C ddd-3.3.1/ddd/logplayer.C --- ddd-3.3.1.orig/ddd/logplayer.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/logplayer.C 2003-07-03 13:14:00.000000000 +0200 @@@@ -42,12 +42,14 @@@@ #include "config.h" #include "streampos.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include + +using std::ifstream; #include #include @@@@ -232,7 +234,7 @@@@ // Report line char buffer[256]; sprintf(buffer, "%4d", command_no); - ostrstream os; + std::ostrstream os; os << buffer << " " << in << "\n"; put(os); @@@@ -302,7 +304,7 @@@@ int line = 1; bool at_start_of_line = true; - ostrstream os; + std::ostrstream os; for (;;) { char c; @@@@ -332,7 +334,7 @@@@ if (!scanning && ddd_line == ".") { - ostrstream os; + std::ostrstream os; os << "Expecting " << command_no << " " << quote(in) << "\n"; put(os); diff -Naur ddd-3.3.1.orig/ddd/options.C ddd-3.3.1/ddd/options.C --- ddd-3.3.1.orig/ddd/options.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/options.C 2003-07-03 13:14:32.000000000 +0200 @@@@ -1529,7 +1529,7 @@@@ gcore.gsub("@@FILE@@", target); gcore.gsub("@@PID@@", itostring(info.pid)); string cmd = sh_command(gcore, true) + " 2>&1"; - ostrstream errs; + std::ostrstream errs; FILE *fp = popen(cmd, "r"); if (fp != 0) { @@@@ -1607,7 +1607,7 @@@@ // Kill the process, hopefully leaving a core file. // Since g77 catches SIGABRT, we disable its handler first. - ostrstream os; + std::ostrstream os; os << "signal(" << SIGABRT << ", " << (unsigned long)SIG_DFL << ")"; gdb_question(gdb->print_command(string(os))); @@@@ -2148,7 +2148,7 @@@@ XWindowAttributes attr; XGetWindowAttributes(XtDisplay(w), frame(w), &attr); - ostrstream geometry; + std::ostrstream geometry; if (include_size) geometry << width << "x" << height; geometry << "+" << attr.x << "+" << attr.y; @@@@ -2208,7 +2208,7 @@@@ } // Stream to hold data and breakpoints - ostrstream rs; + std::ostrstream rs; // Get breakpoints and cursor position bool breakpoints_ok = source_view->get_state(rs); @@@@ -2261,7 +2261,7 @@@@ } // Stream to hold exec and core file specs - ostrstream es; + std::ostrstream es; if (reload_file) { @@@@ -2589,7 +2589,7 @@@@ // Themes os << "\n! Themes.\n"; - ostrstream themes; + std::ostrstream themes; themes << DispBox::theme_manager; static string themes_s; themes_s = themes; diff -Naur ddd-3.3.1.orig/ddd/plotter.C ddd-3.3.1/ddd/plotter.C --- ddd-3.3.1.orig/ddd/plotter.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/plotter.C 2003-07-03 13:15:14.000000000 +0200 @@@@ -276,7 +276,7 @@@@ return; } - ostrstream s; + std::ostrstream s; int c; while ((c = is.get()) != EOF) s << (unsigned char)c; diff -Naur ddd-3.3.1.orig/ddd/session.C ddd-3.3.1/ddd/session.C --- ddd-3.3.1.orig/ddd/session.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/session.C 2003-07-03 13:17:25.000000000 +0200 @@@@ -312,7 +312,7 @@@@ // Same, but issue messages in status line void create_session_dir(const string& session) { - ostrstream messages; + std::ostrstream messages; create_session_dir(session, messages); string msg(messages); while (msg != "") diff -Naur ddd-3.3.1.orig/ddd/settings.C ddd-3.3.1/ddd/settings.C --- ddd-3.3.1.orig/ddd/settings.C 2001-04-30 09:55:19.000000000 +0200 +++ ddd-3.3.1/ddd/settings.C 2003-07-03 13:17:29.000000000 +0200 @@@@ -350,7 +350,7 @@@@ FILE *fp = popen(sh_command(cmd), "r"); if (fp != 0) { - ostrstream info; + std::ostrstream info; int c; while ((c = getc(fp)) != EOF) info << char(c); @@@@ -497,7 +497,7 @@@@ if (DispBox::theme_manager.has_pattern(theme)) p = DispBox::theme_manager.pattern(theme); - ostrstream os; + std::ostrstream os; os << p; string current_value = string(os); @@@@ -511,7 +511,7 @@@@ if (have_pattern) { ThemePattern p = old_tm.pattern(theme); - ostrstream os; + std::ostrstream os; os << p; old_value = string(os); } @@@@ -803,7 +803,7 @@@@ if (!init) { // Save current state in undo buffer - ostrstream command; + std::ostrstream command; get_setting(command, gdb->type(), XtName(button), settings_values[button]); undo_buffer.add_command(string(command)); @@@@ -2908,7 +2908,7 @@@@ set = DispBox::theme_manager.pattern(theme).active(); } - ostrstream os; + std::ostrstream os; os << p; string value = string(os); if (value == "") @@@@ -3162,7 +3162,7 @@@@ if (settings == 0) return ""; - ostrstream command; + std::ostrstream command; for (int i = 0; i < settings_entries.size(); i++) { Widget entry = settings_entries[i]; diff -Naur ddd-3.3.1.orig/ddd/show.C ddd-3.3.1/ddd/show.C --- ddd-3.3.1.orig/ddd/show.C 2001-04-26 16:17:19.000000000 +0200 +++ ddd-3.3.1/ddd/show.C 2003-07-03 13:17:36.000000000 +0200 @@@@ -471,7 +471,7 @@@@ } else { - ostrstream text; + std::ostrstream text; formatter(text); string s(text); @@@@ -531,7 +531,7 @@@@ { StatusMsg msg("Invoking " DDD_NAME " license browser"); - ostrstream license; + std::ostrstream license; int ret = ddd_license(license); string s(license); s.prepend("@@license@@"); @@@@ -571,7 +571,7 @@@@ { StatusMsg msg("Invoking " DDD_NAME " news browser"); - ostrstream news; + std::ostrstream news; int ret = ddd_news(news); string s(news); s.prepend("@@news@@"); @@@@ -625,7 +625,7 @@@@ { StatusMsg msg("Invoking " DDD_NAME " manual browser"); - ostrstream man; + std::ostrstream man; int ret = ddd_man(man); string s(man); @@@@ -664,7 +664,7 @@@@ FILE *fp = popen(sh_command(cmd), "r"); if (fp != 0) { - ostrstream man; + std::ostrstream man; int c; int i = 0; while ((c = getc(fp)) != EOF) diff -Naur ddd-3.3.1.orig/ddd/strclass.C ddd-3.3.1/ddd/strclass.C --- ddd-3.3.1.orig/ddd/strclass.C 2001-03-30 14:31:46.000000000 +0200 +++ ddd-3.3.1/ddd/strclass.C 2003-07-03 12:27:00.000000000 +0200 @@@@ -41,15 +41,17 @@@@ #include "strclass.h" #include "config.h" #include "return.h" -#include -#include -#include -#include +#include +#include +#include +#include #if HAVE_LIMITS_H -#include +#include #endif +using std::ifstream; + void string::error(const char* msg) const { cerr << "string: " << msg << "\n"; diff -Naur ddd-3.3.1.orig/ddd/strclass.h ddd-3.3.1/ddd/strclass.h --- ddd-3.3.1.orig/ddd/strclass.h 2000-12-20 13:30:25.000000000 +0100 +++ ddd-3.3.1/ddd/strclass.h 2003-07-03 12:50:02.000000000 +0200 @@@@ -410,7 +410,11 @@@@ #endif #include -#include +#include +#include +#include +#include +#include #include "rxclass.h" #include "config.h" #include "bool.h" @@@@ -540,7 +544,7 @@@@ string(const char* t); string(const char* t, int len); string(char c); - string(ostrstream& os); // should be const + string(std::ostrstream& os); // should be const ~string(); @@@@ -552,7 +556,7 @@@@ string& operator = (char* y); string& operator = (char c); string& operator = (const subString& y); - string& operator = (ostrstream& os); + string& operator = (std::ostrstream& os); // Concatenation string& operator += (const string& y); @@@@ -1046,7 +1050,7 @@@@ rep = string_Salloc(rep, &c, 1, 1); return *this; } -inline string& string::operator = (ostrstream& os) +inline string& string::operator = (std::ostrstream& os) { assert(!consuming()); @@@@ -1080,7 +1084,7 @@@@ return *this; } -inline string::string(ostrstream& os) +inline string::string(std::ostrstream& os) : rep(&_nilstrRep) #if STRING_CHECK_CONSUME , consume(false) diff -Naur ddd-3.3.1.orig/ddd/vsldoc.C ddd-3.3.1/ddd/vsldoc.C --- ddd-3.3.1.orig/ddd/vsldoc.C 2000-06-16 13:29:16.000000000 +0200 +++ ddd-3.3.1/ddd/vsldoc.C 2003-07-03 13:17:44.000000000 +0200 @@@@ -80,7 +80,7 @@@@ if (fp == 0) return ""; - ostrstream os; + std::ostrstream os; int c; while ((c = getc(fp)) != EOF) os << (char)c; diff -Naur ddd-3.3.1.orig/ddd/windows.C ddd-3.3.1/ddd/windows.C --- ddd-3.3.1.orig/ddd/windows.C 2001-04-26 13:08:07.000000000 +0200 +++ ddd-3.3.1/ddd/windows.C 2003-07-03 13:26:28.000000000 +0200 @@@@ -266,7 +266,7 @@@@ BoxPoint given_pos = pos + tool_shell_move_offset; - ostrstream os; + std::ostrstream os; os << "+" << given_pos[X] << "+" << given_pos[Y]; last_tool_shell_geometry = string(os); last_tool_shell_position = pos; diff -Naur ddd-3.3.1.orig/termcap/termcap.h ddd-3.3.1/termcap/termcap.h --- ddd-3.3.1.orig/termcap/termcap.h 1995-05-17 20:47:28.000000000 +0200 +++ ddd-3.3.1/termcap/termcap.h 2003-07-03 12:27:00.000000000 +0200 a38 8 @@@@ -45,7 +44,6 @@@@ extern int tgetflag (); extern char *tgetstr (); -extern char PC; extern short ospeed; extern void tputs (); @ 1.4 log @Fixed the build by configuring without athena widgets, and removed unused 'PC' identifier which conflicted @ text @d1 737 a737 2 --- ddd/logplayer.C Wed Jan 29 17:55:33 2003 +++ ddd/logplayer.C Wed Jan 29 17:55:51 2003 d758 217 a974 3 --- ddd/strclass.C Fri Mar 30 14:31:46 2001 +++ ddd/strclass.C Thu Jan 30 13:59:13 2003 @@@@ -41,14 +41,16 @@@@ d991 2 d994 40 a1033 1 +using std::ifstream; d1035 2 a1036 1 void string::error(const char* msg) const d1038 27 a1064 4 --- ddd/ddd.C 2003-03-07 14:22:43.210793779 +0100 +++ ddd/ddd.C 2003-03-07 14:21:56.827359051 +0100 @@@@ -872,7 +872,7 @@@@ //----------------------------------------------------------------------------- d1066 1 a1066 4 struct RecentItems { - enum RecentItem { R1, R2, R3, R4, R5, R6, R7, R8, R9 }; + enum RecentItem { Re1, Re2, Re3, Re4, Re5, Re6, Re7, Re8, Re9 }; }; d1068 8 a1075 3 #define RECENT_MENU \ --- termcap/termcap.h 2003-03-07 16:27:07.230932080 +0100 +++ termcap/termcap.h 2003-03-07 16:27:52.213431935 +0100 @ 1.3 log @Patched to not conflict with the SVR4 R1 ia32 register identifier @ text @d58 18 @ 1.2 log @- canonicalize the Autoconf patching to being able to use %patch - filter %description through the usual par(1) formatting - fix homepage URL - get rid of g++ warnings by using -Wno-deprecated - fix broken datadir redirection @ text @d47 11 @ 1.1 log @Second stage done, and the ddd build now succeeds. @ text @d1 2 a2 15 diff -Naur ddd-3.3.1.orig/ddd/config.h ddd-3.3.1/ddd/config.h --- ddd-3.3.1.orig/ddd/config.h Tue Jan 28 14:28:12 2003 +++ ddd-3.3.1/ddd/config.h Fri Jan 31 14:53:34 2003 @@@@ -139,7 +139,7 @@@@ /* #undef HAVE_FREEZE_OSTRSTREAMBUF */ /* Define if the ios::iostate type is defined or declared in . */ -/* #undef HAVE_IOSTATE */ +#define HAVE_IOSTATE 1 /* Define if your C++ compiler supports long long types. */ #define HAVE_LONG_LONG 1 diff -Naur ddd-3.3.1.orig/ddd/logplayer.C ddd-3.3.1/ddd/logplayer.C --- ddd-3.3.1.orig/ddd/logplayer.C Wed Jan 29 17:55:33 2003 +++ ddd-3.3.1/ddd/logplayer.C Wed Jan 29 17:55:51 2003 d23 2 a24 3 diff -Naur ddd-3.3.1.orig/ddd/strclass.C ddd-3.3.1/ddd/strclass.C --- ddd-3.3.1.orig/ddd/strclass.C Fri Mar 30 14:31:46 2001 +++ ddd-3.3.1/ddd/strclass.C Thu Jan 30 13:59:13 2003 @