tags 461680 +patch
severity 461680 serious
thanks
Hi,
I'm attaching a patch to fix this problem. Please take into account that the
gcc 4.3 issues are now release critical bugs as gcc 4.3 is the default compiler
in some architectures, so if you don't upload a fix soon, it will probably be
NMUed.
Thanks,
--
" Software is like sex it's better when it's free. " -- (Linux Slogan)
Saludos /\/\ /\ >< `/
--- ivtools-1.1.3/src/ComTerp/comterp.c
+++ ivtools-1.1.3/src/ComTerp/comterp.c
@@ -68,6 +68,9 @@
#define TITLE "ComTerp"
#define STREAM_MECH
+using std::cerr;
+using std::cout;
+
implementTable(ComValueTable,int,void*)
ComTerp* ComTerp::_instance = nil;
--- ivtools-1.1.3/src/ComTerp/ctrlfunc.c
+++ ivtools-1.1.3/src/ComTerp/ctrlfunc.c
@@ -22,6 +22,7 @@
*/
#include <fstream.h>
+#include <iostream>
#include <ComTerp/comhandler.h>
#include <ComTerp/ctrlfunc.h>
@@ -42,6 +43,7 @@
#endif
#endif
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3/src/ComTerp/debugfunc.c
+++ ivtools-1.1.3/src/ComTerp/debugfunc.c
@@ -24,7 +24,7 @@
#if __GNUC__==2 && __GNUC_MINOR__<=7
#else
-#include <vector.h>
+#include <vector>
#endif
#if __GNUC__>=3
#include <fstream.h>
@@ -35,6 +35,11 @@
#include <ComTerp/debugfunc.h>
#include <ComTerp/comterpserv.h>
#include <strstream>
+#include <iostream>
+#include <fstream>
+
+using std::cerr;
+using std::vector;
#define TITLE "DebugFunc"
--- ivtools-1.1.3/src/InterViews/session.c
+++ ivtools-1.1.3/src/InterViews/session.c
@@ -39,7 +39,7 @@
#include <OS/list.h>
#include <OS/string.h>
#include <ctype.h>
-#include <stdio.h>
+#include <cstdio>
#include <stdlib.h>
#ifdef sgi
--- ivtools-1.1.3/src/OS/file.c
+++ ivtools-1.1.3/src/OS/file.c
@@ -27,7 +27,7 @@
#include <OS/types.h>
#include <assert.h>
#include <fcntl.h>
-#include <stdio.h>
+#include <cstdio>
#include <sys/stat.h>
#ifdef sgi
--- ivtools-1.1.3/src/OverlayUnidraw/ovcmds.c
+++ ivtools-1.1.3/src/OverlayUnidraw/ovcmds.c
@@ -87,6 +87,9 @@
#include <fstream.h>
#include <iostream.h>
+using std::cerr;
+using std::ofstream;
+
/*****************************************************************************/
static const float GRID_XINCR = 8; // default grid spacing
--- ivtools-1.1.3/src/Unidraw/catalog.c
+++ ivtools-1.1.3/src/Unidraw/catalog.c
@@ -69,8 +69,11 @@
#include <unistd.h>
#endif
#include <sys/file.h>
+#include <iostream>
#include <fstream.h>
+using std::cerr;
+
#ifdef __DECCXX
extern "C" {
extern int access(char*, int);
--- ivtools-1.1.3.orig/src/DrawServ/drawfunc.c
+++ ivtools-1.1.3/src/DrawServ/drawfunc.c
@@ -29,6 +29,8 @@
#include <DrawServ/draweditor.h>
#include <DrawServ/drawfunc.h>
+#include <cstdio>
+
#define TITLE "DrawServFunc"
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/DrawServ/drawcomps.c
+++ ivtools-1.1.3/src/DrawServ/drawcomps.c
@@ -40,6 +40,9 @@
#include <Attribute/attrlist.h>
#include <iostream.h>
#include <string.h>
+#include <fstream>
+
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/ComUtil/atox.c
+++ ivtools-1.1.3/src/ComUtil/atox.c
@@ -79,7 +79,7 @@
unsigned long value = 0;
int index;
- string_length = min( sizeof(unsigned long) * 2, strlen( string ));
+ string_length = my_min( sizeof(unsigned long) * 2, strlen( string ));
for( index=0; index<string_length; index++ ) {
if( !isxdigit( string[index] ))
@@ -137,7 +137,7 @@
unsigned long value = 0;
int index;
- string_length = min( sizeof(unsigned long) * 8 / 3, strlen( string ));
+ string_length = my_min( sizeof(unsigned long) * 8 / 3, strlen( string ));
for( index=0; index<string_length; index++ ) {
if( !isodigit( string[index] ))
--- ivtools-1.1.3.orig/src/ComUtil/util.h
+++ ivtools-1.1.3/src/ComUtil/util.h
@@ -114,11 +114,11 @@
extern int TITLE;
#endif
-#if !defined(min) && !defined(COMUTIL_NOMINMAXDEF)
-#define min(a,b) (a<b?a:b)
+#if !defined(my_min) && !defined(COMUTIL_NOMINMAXDEF)
+#define my_min(a,b) (a<b?a:b)
#endif
-#if !defined(max) && !defined(COMUTIL_NOMINMAXDEF)
-#define max(a,b) (a>b?a:b)
+#if !defined(my_max) && !defined(COMUTIL_NOMINMAXDEF)
+#define my_max(a,b) (a>b?a:b)
#endif
/* Return Status for functions */
--- ivtools-1.1.3.orig/src/ComUtil/errsys.c
+++ ivtools-1.1.3/src/ComUtil/errsys.c
@@ -424,7 +424,7 @@
for( index=TopError; index>=0; index-- ) {
fseek( ErrorIOFile, (long)ErrorStructs[index].erroff, SEEK_SET );
fgets( buffer,
- min( BUFSIZ, ErrorStructs[index].errlen+1),
+ my_min( BUFSIZ, ErrorStructs[index].errlen+1),
ErrorIOFile );
fprintf( outstream, "%s\n", buffer );
}
@@ -435,7 +435,7 @@
/* with command substituted for the function name */
else {
fseek( ErrorIOFile, (long)ErrorStructs[TopError].erroff, SEEK_SET );
- fgets( buffer, min( BUFSIZ, ErrorStructs[TopError].errlen+1),
+ fgets( buffer, my_min( BUFSIZ, ErrorStructs[TopError].errlen+1),
ErrorIOFile );
ptr = buffer;
if( isident( *ptr ))
@@ -532,7 +532,7 @@
for( index=TopError; index>=0; index-- ) {
fseek( ErrorIOFile, (long)ErrorStructs[index].erroff, SEEK_SET );
fgets( buffer,
- min( BUFSIZ, ErrorStructs[index].errlen+1),
+ my_min( BUFSIZ, ErrorStructs[index].errlen+1),
ErrorIOFile );
fprintf( outstream, "%s\n", buffer );
}
@@ -544,7 +544,7 @@
else {
#endif
fseek( ErrorIOFile, (long)ErrorStructs[TopError].erroff, SEEK_SET );
- fgets( buffer, min( BUFSIZ, ErrorStructs[TopError].errlen+1),
+ fgets( buffer, my_min( BUFSIZ, ErrorStructs[TopError].errlen+1),
ErrorIOFile );
ptr = buffer;
if( isident( *ptr ))
--- ivtools-1.1.3.orig/src/ComUtil/optable.c
+++ ivtools-1.1.3/src/ComUtil/optable.c
@@ -312,7 +312,7 @@
COMERR_SET1( ERR_PRIORITY_RANGE, priority );
return FUNCBAD;
}
- MaxPriority = max( MaxPriority, priority );
+ MaxPriority = my_max( MaxPriority, priority );
/* Search for place to insert operator */
while( table_off < NumOperators &&
--- ivtools-1.1.3.orig/src/ComTerp/assignfunc.c
+++ ivtools-1.1.3/src/ComTerp/assignfunc.c
@@ -29,6 +29,10 @@
#include <Attribute/attribute.h>
#include <InterViews/resource.h>
+#include <fstream>
+#include <iostream>
+using std::cerr;
+
#define TITLE "AssignFunc"
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/ComTerp/helpfunc.c
+++ ivtools-1.1.3/src/ComTerp/helpfunc.c
@@ -38,9 +38,12 @@
#if __GNUC__>=3
#include <fstream.h>
#endif
+#include <streambuf>
#define TITLE "HelpFunc"
+using std::streambuf;
+
/*****************************************************************************/
HelpFunc::HelpFunc(ComTerp* comterp) : ComFunc(comterp) {
--- ivtools-1.1.3.orig/src/ComTerp/iofunc.c
+++ ivtools-1.1.3/src/ComTerp/iofunc.c
@@ -35,9 +35,12 @@
#if __GNUC__>=3
#include <fstream.h>
#endif
+#include <streambuf>
#define TITLE "IoFunc"
+using std::streambuf;
+
/*****************************************************************************/
PrintFunc::PrintFunc(ComTerp* comterp) : ComFunc(comterp) {
--- ivtools-1.1.3.orig/src/ComTerp/dotfunc.c
+++ ivtools-1.1.3/src/ComTerp/dotfunc.c
@@ -27,9 +27,13 @@
#include <ComTerp/comterp.h>
#include <Attribute/attrlist.h>
#include <Attribute/attribute.h>
+#include <iostream>
+#include <fstream>
#define TITLE "DotFunc"
+using std::cerr;
+
/*****************************************************************************/
int DotFunc::_symid = -1;
--- ivtools-1.1.3.orig/src/idemo/main.c
+++ ivtools-1.1.3/src/idemo/main.c
@@ -41,7 +41,7 @@
#include <InterViews/transformer.h>
#include <InterViews/window.h>
#include <OS/string.h>
-#include <stdio.h>
+#include <cstdio>
static const Coord tool_scale = 12.0;
--- ivtools-1.1.3.orig/src/InterViews/kit.c
+++ ivtools-1.1.3/src/InterViews/kit.c
@@ -71,7 +71,7 @@
#include <OS/list.h>
#include <OS/string.h>
#include <OS/ustring.h>
-#include <stdio.h>
+#include <cstdio>
declareActionCallback(Session)
implementActionCallback(Session)
--- ivtools-1.1.3.orig/src/InterViews/fchooser.c
+++ ivtools-1.1.3/src/InterViews/fchooser.c
@@ -41,7 +41,7 @@
#include <InterViews/target.h>
#include <OS/directory.h>
#include <OS/string.h>
-#include <stdio.h>
+#include <cstdio>
class FileChooserImpl {
private:
--- ivtools-1.1.3.orig/src/InterViews/field.c
+++ ivtools-1.1.3/src/InterViews/field.c
@@ -60,7 +60,7 @@
#include <OS/math.h>
#include <OS/string.h>
-#include <stdio.h>
+#include <cstdio>
#include <string.h>
class FieldStringEditor : public StringEditor {
--- ivtools-1.1.3.orig/src/InterViews/regexp.c
+++ ivtools-1.1.3/src/InterViews/regexp.c
@@ -29,6 +29,10 @@
#include <InterViews/regexp.h>
#include <stream.h>
#include <string.h>
+#include <fstream>
+#include <iostream>
+
+using std::cerr;
/*
* This version is based on the Henry Spencers public domain reimplementation
--- ivtools-1.1.3.orig/src/InterViews/ol_kit.c
+++ ivtools-1.1.3/src/InterViews/ol_kit.c
@@ -43,7 +43,7 @@
#include <InterViews/telltale.h>
#include <InterViews/window.h>
#include <OS/string.h>
-#include <stdio.h>
+#include <cstdio>
/*
* character definitions
--- ivtools-1.1.3.orig/src/Attribute/attrlist.c
+++ ivtools-1.1.3/src/Attribute/attrlist.c
@@ -38,10 +38,12 @@
#include <iostream.h>
#include <string.h>
+#include <fstream>
#include <IV-2_6/_enter.h>
/*****************************************************************************/
+using std::cerr;
int AttributeList::_symid = -1;
--- ivtools-1.1.3.orig/src/Attribute/paramlist.c
+++ ivtools-1.1.3/src/Attribute/paramlist.c
@@ -36,6 +36,7 @@
#include <ctype.h>
#include <iostream.h>
+#include <fstream>
#include <stdio.h>
#include <string.h>
#ifndef __APPLE__
@@ -43,6 +44,7 @@
#endif
/*****************************************************************************/
+using std::cerr;
static const int BUFSIZE = 10000;
static char textbuf[BUFSIZE];
--- ivtools-1.1.3.orig/src/flipbook/main.c
+++ ivtools-1.1.3/src/flipbook/main.c
@@ -45,6 +45,9 @@
#include <string.h>
#include <math.h>
#include <version.h>
+#include <iostream>
+
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/OverlayUnidraw/ovraster.h
+++ ivtools-1.1.3/src/OverlayUnidraw/ovraster.h
@@ -360,7 +360,7 @@
virtual void flush() const;
// flush internal XImage data structure to a pixmap on the X server.
- virtual void flushrect(IntCoord l, IntCoord b, IntCoord t, IntCoord t) const;
+ virtual void flushrect(IntCoord l, IntCoord b, IntCoord s, IntCoord t) const;
// flush rectangular region of internal XImage data structure
// to a pixmap on the X server.
--- ivtools-1.1.3.orig/src/OverlayUnidraw/ovline.c
+++ ivtools-1.1.3/src/OverlayUnidraw/ovline.c
@@ -64,6 +64,11 @@
#include <math.h>
#include <stream.h>
+#include <fstream>
+#include <iostream>
+
+using std::cerr;
+
/*****************************************************************************/
ParamList* LineOvComp::_ovline_params = nil;
--- ivtools-1.1.3.orig/src/OverlayUnidraw/scriptview.c
+++ ivtools-1.1.3/src/OverlayUnidraw/scriptview.c
@@ -64,6 +64,10 @@
#include <stream.h>
#include <stdio.h>
#include <string.h>
+#include <fstream>
+#include <iostream>
+
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/OverlayUnidraw/ovraster.c
+++ ivtools-1.1.3/src/OverlayUnidraw/ovraster.c
@@ -73,6 +73,10 @@
#include <stdio.h>
#include <stream.h>
#include <string.h>
+#include <iostream>
+#include <fstream>
+
+using std::cerr;
implementList(CopyStringList,CopyString)
--- ivtools-1.1.3.orig/src/OverlayUnidraw/ovcatalog.c
+++ ivtools-1.1.3/src/OverlayUnidraw/ovcatalog.c
@@ -67,6 +67,9 @@
#include <stream.h>
#include <string.h>
#include <fstream.h>
+#include <iostream>
+
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/OverlayUnidraw/ovstates.c
+++ ivtools-1.1.3/src/OverlayUnidraw/ovstates.c
@@ -26,6 +26,11 @@
#include <OverlayUnidraw/ovviewer.h>
#include <stdio.h>
+#include <iostream>
+#include <fstream>
+
+using std::cerr;
+
/*****************************************************************************/
PtrLocState::PtrLocState(PixelCoord x, PixelCoord y, OverlayEditor* ed) :NameState(nil)
--- ivtools-1.1.3.orig/src/OverlayUnidraw/ovarrow.c
+++ ivtools-1.1.3/src/OverlayUnidraw/ovarrow.c
@@ -66,6 +66,10 @@
#include <math.h>
#include <stdio.h>
#include <stream.h>
+#include <iostream>
+#include <fstream>
+
+using std::cerr;
/****************************************************************************/
--- ivtools-1.1.3.orig/src/OverlayUnidraw/oved.c
+++ ivtools-1.1.3/src/OverlayUnidraw/oved.c
@@ -75,7 +75,7 @@
#include <OS/math.h>
#include <ctype.h>
-#include <stdio.h>
+#include <cstdio>
#include <stdlib.h>
#include <string.h>
--- ivtools-1.1.3.orig/src/OverlayUnidraw/ovspline.c
+++ ivtools-1.1.3/src/OverlayUnidraw/ovspline.c
@@ -51,6 +51,10 @@
#include <Attribute/attrlist.h>
#include <stream.h>
+#include <iostream>
+#include <fstream>
+
+using std::cerr;
/****************************************************************************/
--- ivtools-1.1.3.orig/src/OverlayUnidraw/ovcomps.c
+++ ivtools-1.1.3/src/OverlayUnidraw/ovcomps.c
@@ -60,6 +60,10 @@
#include <unistd.h>
#include <stdlib.h>
+#include <fstream>
+
+using std::cerr;
+
#if __GNUC__<2 || __GNUC__==2 && __GNUC_MINOR__<96
extern "C"
{
--- ivtools-1.1.3.orig/src/OverlayUnidraw/ovpolygon.c
+++ ivtools-1.1.3/src/OverlayUnidraw/ovpolygon.c
@@ -54,6 +54,11 @@
#include <stream.h>
+#include <iostream>
+#include <fstream>
+
+using std::cerr;
+
/****************************************************************************/
ParamList* PolygonOvComp::_ovpolygon_params = nil;
--- ivtools-1.1.3.orig/src/OverlayUnidraw/ovimport.c
+++ ivtools-1.1.3/src/OverlayUnidraw/ovimport.c
@@ -104,6 +104,11 @@
#include <fcntl.h>
#include <errno.h>
#include <phold.h>
+#include <iostream>
+
+using std::cerr;
+using std::endl;
+using std::ifstream;
declarePtrList(PipeList,FILE)
declarePtrList(FileList,FILE)
--- ivtools-1.1.3.orig/src/OverlayUnidraw/ovstencil.c
+++ ivtools-1.1.3/src/OverlayUnidraw/ovstencil.c
@@ -46,6 +46,10 @@
#include <stdio.h>
#include <stream.h>
#include <string.h>
+#include <fstream>
+#include <iostream>
+
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/OverlayUnidraw/ovfile.c
+++ ivtools-1.1.3/src/OverlayUnidraw/ovfile.c
@@ -39,6 +39,9 @@
#include <stream.h>
#include <string.h>
#include <fstream.h>
+#include <iostream>
+
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/UniIdraw/ided.c
+++ ivtools-1.1.3/src/UniIdraw/ided.c
@@ -97,7 +97,7 @@
#include <OS/math.h>
-#include <stdio.h>
+#include <cstdio>
#include <stdlib.h>
#include <string.h>
--- ivtools-1.1.3.orig/src/UniIdraw/idcatalog.c
+++ ivtools-1.1.3/src/UniIdraw/idcatalog.c
@@ -56,6 +56,9 @@
#include <stream.h>
#include <string.h>
#include <fstream.h>
+#include <iostream>
+
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/GraphUnidraw/nodecomp.c
+++ ivtools-1.1.3/src/GraphUnidraw/nodecomp.c
@@ -79,6 +79,9 @@
#include <stdio.h>
#include <string.h>
#include <strstream>
+#include <fstream>
+
+using std::cerr;
FullGraphic* NodeView::_nv_gs = nil;
--- ivtools-1.1.3.orig/src/drawtool/main.c
+++ ivtools-1.1.3/src/drawtool/main.c
@@ -49,6 +49,10 @@
#include <string.h>
#include <math.h>
#include <version.h>
+#include <iostream>
+#include <fstream>
+
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/drawserv_/main.c
+++ ivtools-1.1.3/src/drawserv_/main.c
@@ -57,6 +57,10 @@
#include <string.h>
#include <math.h>
#include <version.h>
+#include <fstream>
+#include <iostream>
+
+using std::cerr;
static int nmsg = 0;
--- ivtools-1.1.3.orig/src/iclass/main.c
+++ ivtools-1.1.3/src/iclass/main.c
@@ -34,6 +34,9 @@
#include <string.h>
#include <iostream.h>
+#include <fstream>
+
+using std::cout;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/Time/Time.c
+++ ivtools-1.1.3/src/Time/Time.c
@@ -30,9 +30,13 @@
#include <Time/Date.h>
#include <Time/Time.h>
-#include <iomanip.h>
+#include <iomanip>
+#include <iostream>
-#include <stdio.h>
+#include <cstdio>
+
+using std::setfill;
+using std::setw;
const unsigned VERSION =2;
--- ivtools-1.1.3.orig/src/Time/Time.h
+++ ivtools-1.1.3/src/Time/Time.h
@@ -31,6 +31,10 @@
#ifndef TIME_H
#define TIME_H
+#include <iostream>
+#include <fstream>
+
+using std::cout;
#if defined(SYSV) && ! defined(hpux)
--- ivtools-1.1.3.orig/src/Time/Date.c
+++ ivtools-1.1.3/src/Time/Date.c
@@ -64,10 +64,14 @@
#include <Time/Time.h>
#include <OS/string.h>
-#include <iomanip.h>
+#include <iomanip>
#include <ctype.h>
#include <string.h>
-#include <stdio.h>
+#include <cstdio>
+#include <iostream>
+
+using std::setfill;
+using std::setw;
#define THIS Date
#define BASE Object
--- ivtools-1.1.3.orig/src/OS/string.c
+++ ivtools-1.1.3/src/OS/string.c
@@ -26,7 +26,7 @@
#include <ctype.h>
#include <string.h>
#include <iostream.h>
-#include <streambuf.h>
+#include <streambuf>
/*
* Just to be sure ...
--- ivtools-1.1.3.orig/src/comtest/main.c
+++ ivtools-1.1.3/src/comtest/main.c
@@ -25,6 +25,11 @@
#include <iostream.h>
#include <string.h>
+#include <fstream>
+
+using std::cerr;
+using std::cout;
+using std::endl;
char* type_names[] = {
"None",
--- ivtools-1.1.3.orig/src/comdraw/main.c
+++ ivtools-1.1.3/src/comdraw/main.c
@@ -50,6 +50,9 @@
#include <string.h>
#include <math.h>
#include <version.h>
+#include <iostream>
+
+using std::cerr;
static int nmsg = 0;
--- ivtools-1.1.3.orig/src/FrameUnidraw/framefunc.c
+++ ivtools-1.1.3/src/FrameUnidraw/framefunc.c
@@ -33,6 +33,9 @@
#include <Attribute/attrlist.h>
#include <OS/math.h>
#include <iostream.h>
+#include <fstream>
+
+using std::cerr;
static int on_symid = symbol_add("on");
static int off_symid = symbol_add("off");
--- ivtools-1.1.3.orig/src/FrameUnidraw/framefile.c
+++ ivtools-1.1.3/src/FrameUnidraw/framefile.c
@@ -39,6 +39,9 @@
#include <stdio.h>
#include <stream.h>
#include <string.h>
+#include <iostream>
+
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/FrameUnidraw/framescripts.c
+++ ivtools-1.1.3/src/FrameUnidraw/framescripts.c
@@ -55,6 +55,9 @@
#include <stdio.h>
#include <stream.h>
#include <string.h>
+#include <iostream>
+
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/AttrGlyph/attredit.c
+++ ivtools-1.1.3/src/AttrGlyph/attredit.c
@@ -46,9 +46,11 @@
#if __GNUC__==2 && __GNUC_MINOR__<=7
#else
#define STL_VECTOR
-#include <vector.h>
+#include <vector>
#endif
+using std::vector;
+
declareActionCallback(AttributeListEditor)
implementActionCallback(AttributeListEditor)
declareFieldEditorCallback(AttributeListEditor)
--- ivtools-1.1.3.orig/src/IV-X11/xraster.c
+++ ivtools-1.1.3/src/IV-X11/xraster.c
@@ -46,6 +46,12 @@
#include <X11/extensions/XShm.h>
#include <IV-X11/Xundefs.h>
+#include <iostream>
+#include <fstream>
+
+using std::cerr;
+using std::endl;
+
// no X prototype
extern "C" int XShmGetEventBase(XDisplay*);
--- ivtools-1.1.3.orig/src/IV-X11/xfont.c
+++ ivtools-1.1.3/src/IV-X11/xfont.c
@@ -38,7 +38,7 @@
#include <OS/ustring.h>
#include <OS/table.h>
#include <X11/Xatom.h>
-#include <stdio.h>
+#include <cstdio>
#include <string.h>
/** class FontImpl **/
--- ivtools-1.1.3.orig/src/IV-X11/xwindow.c
+++ ivtools-1.1.3/src/IV-X11/xwindow.c
@@ -58,6 +58,10 @@
#include <X11/Xatom.h>
#include <sys/ioctl.h>
#include <iostream.h>
+#include <fstream>
+
+using std::cerr;
+
#if defined(sun) && defined(__svr4__)
#include <stropts.h>
#include <sys/conf.h>
--- ivtools-1.1.3.orig/src/idraw/main.c
+++ ivtools-1.1.3/src/idraw/main.c
@@ -36,6 +36,11 @@
#include <version.h>
+#include <iostream>
+#include <fstream>
+
+using std::cerr;
+
/*****************************************************************************/
static PropertyData properties[] = {
--- ivtools-1.1.3.orig/src/include/InterViews/raster.h
+++ ivtools-1.1.3/src/include/InterViews/raster.h
@@ -69,7 +69,7 @@
);
virtual void flush() const;
- virtual void flushrect(IntCoord l, IntCoord b, IntCoord t, IntCoord t) const;
+ virtual void flushrect(IntCoord l, IntCoord b, IntCoord s, IntCoord t) const;
// flush rectangular region of internal XImage data structure
// to a pixmap on the X server.
--- ivtools-1.1.3.orig/src/include/ivstd/iostream.h
+++ ivtools-1.1.3/src/include/ivstd/iostream.h
@@ -1,7 +1,7 @@
#ifndef _iv_iostream_h_
#define _iv_iostream_h_
#include <iosfwd>
-#include_next <iostream.h>
+#include_next <iostream>
#if __GNUC__>=3
#if 0
--- ivtools-1.1.3.orig/src/include/ivstd/fstream.h
+++ ivtools-1.1.3/src/include/ivstd/fstream.h
@@ -1,6 +1,6 @@
#ifndef _iv_fstream_
#define _iv_fstream_
-#include_next <fstream.h>
+#include_next <fstream>
#if __GNUC__>=3
#define input ios_base::in
#define output ios_base::out
--- ivtools-1.1.3.orig/src/IVGlyph/bdvalue.c
+++ ivtools-1.1.3/src/IVGlyph/bdvalue.c
@@ -47,7 +47,7 @@
/* derived from idemo/main.c */
#include <IVGlyph/bdvalue.h>
-#include <stdio.h>
+#include <cstdio>
#include <string.h>
/* class BoundedValue */
--- ivtools-1.1.3.orig/src/IVGlyph/fieldedit.c
+++ ivtools-1.1.3/src/IVGlyph/fieldedit.c
@@ -39,6 +39,9 @@
#include <iostream.h>
#include <string.h>
+#include <fstream>
+
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/IVGlyph/textview.c
+++ ivtools-1.1.3/src/IVGlyph/textview.c
@@ -44,7 +44,7 @@
#include <IV-2_6/InterViews/textdisplay.h>
#include <ctype.h>
-#include <stdio.h>
+#include <cstdio>
#include <string.h>
#define XK_MISCELLANY /* to get the keysym's we need */
--- ivtools-1.1.3.orig/src/IVGlyph/valuator.c
+++ ivtools-1.1.3/src/IVGlyph/valuator.c
@@ -59,7 +59,7 @@
#include <InterViews/patch.h>
#include <InterViews/style.h>
#include <OS/string.h>
-#include <stdio.h>
+#include <cstdio>
#include <string.h>
DragValuator::DragValuator(BoundedValue* bv, Style* style, Action* up, Action* down)
--- ivtools-1.1.3.orig/src/IVGlyph/figure.h
+++ ivtools-1.1.3/src/IVGlyph/figure.h
@@ -286,7 +286,7 @@
public:
Rectangle31 (
const Brush* brush, const Color* stroke, const Color* fill,
- Coord l, Coord b, Coord r, Coord t, Transformer* t = nil
+ Coord l, Coord b, Coord r, Coord s, Transformer* t = nil
);
virtual Glyph* clone() const;
--- ivtools-1.1.3.orig/src/IVGlyph/bdfltform.c
+++ ivtools-1.1.3/src/IVGlyph/bdfltform.c
@@ -34,7 +34,7 @@
#include <InterViews/patch.h>
#include <InterViews/session.h>
#include <IV-look/kit.h>
-#include <stdio.h>
+#include <cstdio>
#include <string.h>
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/Unidraw/selection.c
+++ ivtools-1.1.3/src/Unidraw/selection.c
@@ -37,6 +37,10 @@
#include <IV-2_6/_enter.h>
#include <stream.h>
+#include <iostream>
+#include <fstream>
+
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/Unidraw/stateview.c
+++ ivtools-1.1.3/src/Unidraw/stateview.c
@@ -26,6 +26,7 @@
#include <Unidraw/statevar.h>
#include <Unidraw/stateview.h>
+#include <cstdio>
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/Unidraw/stateviews.c
+++ ivtools-1.1.3/src/Unidraw/stateviews.c
@@ -38,7 +38,7 @@
#include <IV-2_6/_enter.h>
-#include <stdio.h>
+#include <cstdio>
#include <string.h>
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/Unidraw/gvupdater.c
+++ ivtools-1.1.3/src/Unidraw/gvupdater.c
@@ -39,6 +39,9 @@
#include <iostream.h>
#include <stdlib.h>
+#include <fstream>
+
+using std::cerr;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/Unidraw/import.c
+++ ivtools-1.1.3/src/Unidraw/import.c
@@ -54,7 +54,7 @@
#include <TIFF/format.h>
#include <OS/string.h>
-#include <stdio.h>
+#include <cstdio>
#include <string.h>
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/Unidraw/csolver.c
+++ ivtools-1.1.3/src/Unidraw/csolver.c
@@ -46,6 +46,11 @@
#include <math.h>
#include <stream.h>
#include <string.h>
+#include <iostream>
+#include <fstream>
+
+using std::cerr;
+using std::cout;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/ComGlyph/comtextview.c
+++ ivtools-1.1.3/src/ComGlyph/comtextview.c
@@ -51,6 +51,10 @@
#include <iostream.h>
#include <strstream>
#include <string.h>
+#include <fstream>
+
+using std::cerr;
+using std::cout;
#define XK_MISCELLANY /* to get the keysym's we need */
#include <X11/keysymdef.h>
--- ivtools-1.1.3.orig/src/IV-common/string.c
+++ ivtools-1.1.3/src/IV-common/string.c
@@ -26,7 +26,7 @@
#include <ctype.h>
#include <string.h>
#include <iostream.h>
-#include <streambuf.h>
+#include <streambuf>
/*
* Just to be sure ...
--- ivtools-1.1.3.orig/src/IV-common/regexp.c
+++ ivtools-1.1.3/src/IV-common/regexp.c
@@ -29,6 +29,10 @@
#include <InterViews/regexp.h>
#include <stream.h>
#include <string.h>
+#include <iostream>
+#include <fstream>
+
+using std::cerr;
/*
* This version is based on the Henry Spencers public domain reimplementation
--- ivtools-1.1.3.orig/src/ComUnidraw/grdotfunc.c
+++ ivtools-1.1.3/src/ComUnidraw/grdotfunc.c
@@ -28,6 +28,10 @@
#include <ComTerp/comterp.h>
#include <Attribute/attrlist.h>
#include <Attribute/attribute.h>
+#include <fstream>
+#include <iostream>
+
+using std::cerr;
#define TITLE "GrDotFunc"
--- ivtools-1.1.3.orig/src/ComUnidraw/unifunc.c
+++ ivtools-1.1.3/src/ComUnidraw/unifunc.c
@@ -62,6 +62,9 @@
#include <fstream.h>
#endif
#include <string.h>
+#include <iostream>
+
+using std::cerr;
#define TITLE "UnidrawFunc"
--- ivtools-1.1.3.orig/src/ComUnidraw/plotfunc.c
+++ ivtools-1.1.3/src/ComUnidraw/plotfunc.c
@@ -31,6 +31,8 @@
#define TITLE "PlotFunc"
+using std::ofstream;
+
/*****************************************************************************/
BarPlotFunc::BarPlotFunc(ComTerp* comterp, Editor* ed) : UnidrawFunc(comterp, ed) {
--- ivtools-1.1.3.orig/src/ComUnidraw/comeditor.c
+++ ivtools-1.1.3/src/ComUnidraw/comeditor.c
@@ -60,6 +60,10 @@
#include <strstream>
#include <string.h>
+#include <fstream>
+#include <iostream>
+
+using std::cout;
/*****************************************************************************/
--- ivtools-1.1.3.orig/src/graphdraw/main.c
+++ ivtools-1.1.3/src/graphdraw/main.c
@@ -45,6 +45,11 @@
#include <math.h>
#include <version.h>
+#include <iostream>
+#include <fstream>
+
+using std::cerr;
+
/*****************************************************************************/
