This patch should fix the use of standard c++ header.
Build with gcc 3.2 on linux.
I'm not sure about your policy for the standard namespace.
Currently, I've simply put std:: in front of
every object declared in the standard namespace,
as some old compilers simply ignore it (gcc 2.95).
This could break the code with some old compilers.
What should I do? Should I add "using" directives at the beginning
of ech file, with #ifdef USE_STD around them? I don't like
this solution, but I can modify the patch if you think
it's the right thing.
The patch is against the libtool branch.
Regards,
Marco Morandini
P.S.
src/exec/dxmods/_compparse.c
and
src/exec/dxmods/_compparse.h
were removed from main trunk but not from libtool branch?
If yes, is this correct?
Index: configure.ac
===================================================================
RCS file: /src/master/dx/Attic/configure.ac,v
retrieving revision 1.1.2.5
diff -u -r1.1.2.5 configure.ac
--- configure.ac 23 Sep 2002 19:03:25 -0000 1.1.2.5
+++ configure.ac 22 Oct 2002 12:13:53 -0000
@@ -1009,8 +1009,9 @@
dnl Need these to define themselves for C++
-AC_CHECK_HEADERS(CC/libc.h direct.h dirent.h iostream.h regexp.h regex.h
stream.h)
-AC_CHECK_HEADERS(strstream.h strstrea.h sysent.h)
+AC_CHECK_HEADERS(CC/libc.h direct.h dirent.h iostream iostream.h regexp.h
regex.h stream.h)
+AC_CHECK_HEADERS(sstream strstream.h strstrea.h sysent.h)
+AC_CHECK_HEADERS(fstream fstream.h)
AC_CHECK_LIB(socket, socket)
AC_CHECK_LIB(nsl, inet_addr)
Index: src/exec/libdx/displayutil.h
===================================================================
RCS file: /src/master/dx/src/exec/libdx/Attic/displayutil.h,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 displayutil.h
--- src/exec/libdx/displayutil.h 11 Oct 2002 19:00:21 -0000 1.1.2.2
+++ src/exec/libdx/displayutil.h 22 Oct 2002 12:14:10 -0000
@@ -48,4 +48,4 @@
#endif /* DX_NATIVE_WINDOWS */
#endif /* WORDS_BIGENDIAN */
-#endif /* _DISPLAYUTIL_H_ */
\ No newline at end of file
+#endif /* _DISPLAYUTIL_H_ */
Index: src/exec/libdx/displayw.h
===================================================================
RCS file: /src/master/dx/src/exec/libdx/Attic/displayw.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 displayw.h
--- src/exec/libdx/displayw.h 1 Oct 2002 19:06:27 -0000 1.1.2.1
+++ src/exec/libdx/displayw.h 22 Oct 2002 12:14:10 -0000
@@ -37,4 +37,4 @@
#endif /* DX_NATIVE_WINDOWS */
-#endif /* _DISPLAYW_H_ */
\ No newline at end of file
+#endif /* _DISPLAYW_H_ */
Index: src/uipp/base/DXType.C
===================================================================
RCS file: /src/master/dx/src/uipp/base/DXType.C,v
retrieving revision 1.8
diff -u -r1.8 DXType.C
--- src/uipp/base/DXType.C 22 Oct 2001 22:06:09 -0000 1.8
+++ src/uipp/base/DXType.C 22 Oct 2002 12:14:15 -0000
@@ -9,15 +9,6 @@
#include <dxconfig.h>
#include "../base/defines.h"
-
-
-
-#if defined(HAVE_IOSTREAM_H)
-#include <iostream.h>
-#endif
-#if defined(HAVE_STREAM_H)
-#include <stream.h>
-#endif
#include "DXStrings.h"
#include "List.h"
#include "ListIterator.h"
Index: src/uipp/base/defines.h
===================================================================
RCS file: /src/master/dx/src/uipp/base/defines.h,v
retrieving revision 1.13.2.1
diff -u -r1.13.2.1 defines.h
--- src/uipp/base/defines.h 20 Aug 2002 22:02:47 -0000 1.13.2.1
+++ src/uipp/base/defines.h 22 Oct 2002 12:14:16 -0000
@@ -47,13 +47,17 @@
#if defined(__cplusplus) || defined(c_plusplus)
-#if defined(HAVE_IOSTREAM_H)
+#if defined(HAVE_IOSTREAM)
+#include <iostream>
+#elif defined(HAVE_IOSTREAM_H)
#include <iostream.h>
-#endif
-
#if defined(HAVE_STREAM_H)
#include <stream.h>
-#endif
+#endif /*HAVE_STREAM_H */
+#else /* !HAVE_IOSTREAM && !HAVE_IOSTREAM_H */
+#error "no iostream and no iostream.h"
+#endif /* !HAVE_IOSTREAM && !HAVE_IOSTREAM_H */
+
#endif
Index: src/uipp/dxuilib/DXApplication.C
===================================================================
RCS file: /src/master/dx/src/uipp/dxuilib/DXApplication.C,v
retrieving revision 1.25
diff -u -r1.25 DXApplication.C
--- src/uipp/dxuilib/DXApplication.C 29 Mar 2002 14:42:58 -0000 1.25
+++ src/uipp/dxuilib/DXApplication.C 22 Oct 2002 12:14:29 -0000
@@ -12,16 +12,8 @@
// putenv should come from stdlib.h
// extern "C" int putenv(char*);
-#if defined(HAVE_IOSTREAM_H)
-#include <iostream.h>
-#endif
-
#if defined(HAVE_IO_H)
#include <io.h>
-#endif
-
-#if defined(HAVE_STREAM_H)
-#include <stream.h>
#endif
#if defined(HAVE_UNISTD_H)
Index: src/uipp/dxuilib/DXLinkHandler.C
===================================================================
RCS file: /src/master/dx/src/uipp/dxuilib/DXLinkHandler.C,v
retrieving revision 1.13
diff -u -r1.13 DXLinkHandler.C
--- src/uipp/dxuilib/DXLinkHandler.C 22 Mar 2002 23:26:19 -0000 1.13
+++ src/uipp/dxuilib/DXLinkHandler.C 22 Oct 2002 12:14:30 -0000
@@ -36,13 +36,6 @@
#include "DXLinkHandler.h"
#include <ctype.h>
#include <stdarg.h>
-#ifdef DXD_WIN
-#include <iostream.h>
-#else
-#if defined(HAVE_STREAM_H)
-#include <stream.h>
-#endif
-#endif
/*
* What follows is a set of routines to handle the DX Application commands.
Index: src/uipp/dxuilib/DXPacketIF.C
===================================================================
RCS file: /src/master/dx/src/uipp/dxuilib/DXPacketIF.C,v
retrieving revision 1.9
diff -u -r1.9 DXPacketIF.C
--- src/uipp/dxuilib/DXPacketIF.C 8 May 2001 15:01:39 -0000 1.9
+++ src/uipp/dxuilib/DXPacketIF.C 22 Oct 2002 12:14:31 -0000
@@ -25,13 +25,6 @@
#include "EditorWindow.h"
#include <stdarg.h>
-#ifdef DXD_WIN
-#include <iostream.h>
-#else
-#if defined(HAVE_STREAM_H)
-#include <stream.h>
-#endif
-#endif
#include <ctype.h>
#include <errno.h>
Index: src/uipp/dxuilib/DXWindow.C
===================================================================
RCS file: /src/master/dx/src/uipp/dxuilib/DXWindow.C,v
retrieving revision 1.11.2.1
diff -u -r1.11.2.1 DXWindow.C
--- src/uipp/dxuilib/DXWindow.C 19 Oct 2002 15:58:52 -0000 1.11.2.1
+++ src/uipp/dxuilib/DXWindow.C 22 Oct 2002 12:14:31 -0000
@@ -12,13 +12,6 @@
-#if defined(DXD_WIN) || defined(OS2) //SMH get correct hdr
-#include <iostream.h>
-#else
-#if defined(HAVE_STREAM_H)
-#include <stream.h>
-#endif
-#endif
#include <Xm/RowColumn.h>
#include <Xm/CascadeB.h>
Index: src/uipp/dxuilib/ImageWindow.C
===================================================================
RCS file: /src/master/dx/src/uipp/dxuilib/ImageWindow.C,v
retrieving revision 1.18
diff -u -r1.18 ImageWindow.C
--- src/uipp/dxuilib/ImageWindow.C 22 Mar 2002 23:26:21 -0000 1.18
+++ src/uipp/dxuilib/ImageWindow.C 22 Oct 2002 12:14:46 -0000
@@ -10,7 +10,6 @@
#include "../base/defines.h"
-#include <iostream.h>
#include <sys/types.h>
#if 0
Index: src/uipp/dxuilib/PacketIF.C
===================================================================
RCS file: /src/master/dx/src/uipp/dxuilib/PacketIF.C,v
retrieving revision 1.30.2.2
diff -u -r1.30.2.2 PacketIF.C
--- src/uipp/dxuilib/PacketIF.C 13 Oct 2002 14:46:13 -0000 1.30.2.2
+++ src/uipp/dxuilib/PacketIF.C 22 Oct 2002 12:14:49 -0000
@@ -61,14 +61,6 @@
#include <io.h>
#endif
-#if defined(HAVE_IOSTREAM_H)
-#include <iostream.h>
-#endif
-
-#if defined(HAVE_STREAM_H)
-#include <stream.h>
-#endif
-
#if defined(HAVE_ARPA_INET_H)
#include <arpa/inet.h>
#endif
Index: src/uipp/dxuilib/StandIn.C
===================================================================
RCS file: /src/master/dx/src/uipp/dxuilib/StandIn.C,v
retrieving revision 1.19.2.1
diff -u -r1.19.2.1 StandIn.C
--- src/uipp/dxuilib/StandIn.C 16 Oct 2002 16:00:36 -0000 1.19.2.1
+++ src/uipp/dxuilib/StandIn.C 22 Oct 2002 12:14:53 -0000
@@ -9,8 +9,6 @@
#include <dxconfig.h>
#include "../base/defines.h"
-#include <iostream.h>
-
#if defined(HAVE_UNISTD_H)
#include <unistd.h>
#endif
Index: src/uipp/mb/MBApplication.C
===================================================================
RCS file: /src/master/dx/src/uipp/mb/MBApplication.C,v
retrieving revision 1.10
diff -u -r1.10 MBApplication.C
--- src/uipp/mb/MBApplication.C 8 May 2001 15:01:43 -0000 1.10
+++ src/uipp/mb/MBApplication.C 22 Oct 2002 12:14:55 -0000
@@ -15,13 +15,6 @@
#include <Xm/Label.h>
#include <X11/cursorfont.h>
-#ifdef DXD_WIN
-#include <iostream.h>
-#else
-#if defined(HAVE_STREAM_H)
-#include <stream.h>
-#endif
-#endif
#if defined(HAVE_UNISTD_H)
#include <unistd.h>
Index: src/uipp/mb/MBMainWindow.C
===================================================================
RCS file: /src/master/dx/src/uipp/mb/MBMainWindow.C,v
retrieving revision 1.8
diff -u -r1.8 MBMainWindow.C
--- src/uipp/mb/MBMainWindow.C 22 May 2000 16:02:55 -0000 1.8
+++ src/uipp/mb/MBMainWindow.C 22 Oct 2002 12:15:04 -0000
@@ -11,8 +11,13 @@
#include "defines.h"
#include <ctype.h>
+
+#if defined(HAVE_FSTREAM)
+#include <fstream>
+#elif defined(HAVE_FSTREAM_H)
#include <fstream.h>
-#include <iostream.h>
+#endif
+
//#include <X11/IntrinsicP.h>
//#include <X11/CoreP.h>
@@ -2836,7 +2841,7 @@
if(!validateMB()) return FALSE;
- ofstream to(file);
+ std::ofstream to(file);
if(!to)
WarningMessage("File open failed on save");
@@ -2856,25 +2861,25 @@
if(this->comment_text[i+1]) to << "# ";
i++;
}
- to << endl;
+ to << std::endl;
}
str = XmTextGetString(this->module_name_text);
to << "MODULE_NAME = "
<< str
- << endl;
+ << std::endl;
XtFree(str);
str = XmTextGetString(this->category_text);
to << "CATEGORY = "
<< str
- << endl;
+ << std::endl;
XtFree(str);
str = XmTextGetString(this->mod_description_text);
to << "MODULE_DESCRIPTION = "
<< str
- << endl;
+ << std::endl;
XtFree(str);
@@ -2883,7 +2888,7 @@
str = XmTextGetString(this->includefile_text);
to << "INCLUDE_FILE = "
<< str
- << endl;
+ << std::endl;
XtFree(str);
}
@@ -2900,28 +2905,28 @@
to << "TRUE";
else
to << "FALSE";
- to << endl;
+ to << std::endl;
to << "SIDE_EFFECT = ";
if(side_effect)
to << "TRUE";
else
to << "FALSE";
- to << endl;
+ to << std::endl;
to << "ASYNCHRONOUS = ";
if(asychronous)
to << "TRUE";
else
to << "FALSE";
- to << endl;
+ to << std::endl;
if(XmToggleButtonGetState(this->runtime_tb))
{
str = XmTextGetString(this->outboard_text);
to << "LOADABLE_EXECUTABLE = "
<< str
- << endl;
+ << std::endl;
XtFree(str);
}
@@ -2930,7 +2935,7 @@
str = XmTextGetString(this->outboard_text);
to << "OUTBOARD_EXECUTABLE = "
<< str
- << endl;
+ << std::endl;
XtFree(str);
to << "OUTBOARD_PERSISTENT = ";
@@ -2938,14 +2943,14 @@
to << "TRUE";
else
to << "FALSE";
- to << endl;
+ to << std::endl;
if(STRLEN(host) > 0)
- to << "OUTBOARD_HOST = " << host << endl;
+ to << "OUTBOARD_HOST = " << host << std::endl;
}
// Space after module section
- to << endl;
+ to << std::endl;
XtVaGetValues(this->num_inputs_stepper, XmNiValue, &num_inputs, NULL);
for(i = 1; i <= num_inputs; i++)
@@ -2954,17 +2959,17 @@
to << "INPUT = "
<< param->getName()
- << endl;
+ << std::endl;
if(param->getDescription()) {
to << "DESCRIPTION = "
<< param->getDescription()
- << endl;
+ << std::endl;
}
else {
to << "DESCRIPTION = "
<< " "
- << endl;
+ << std::endl;
}
to << "REQUIRED = ";
@@ -2972,20 +2977,20 @@
to << "TRUE";
else
to << "FALSE";
- to << endl;
+ to << std::endl;
if(!param->getRequired())
{
to << "DEFAULT_VALUE = "
<< param->getDefaultValue()
- << endl;
+ << std::endl;
to << "DESCRIPTIVE = ";
if(param->getDescriptive())
to << "TRUE";
else
to << "FALSE";
- to << endl;
+ to << std::endl;
}
param_type = param->getType();
first = TRUE;
@@ -3007,50 +3012,50 @@
}
}
if(!first)
- to << endl;
+ to << std::endl;
to << "STRUCTURE = "
<< param->getStructure()
- << endl;
+ << std::endl;
if(!EqualString(param->getStructure(), "Value"))
{
to << "POSITIONS = "
<< param->getPositions()
- << endl;
+ << std::endl;
to << "CONNECTIONS = "
<< param->getConnections()
- << endl;
+ << std::endl;
to << "ELEMENT_TYPE = "
<< param->getElementType()
- << endl;
+ << std::endl;
to << "DEPENDENCY = "
<< param->getDependency()
- << endl;
+ << std::endl;
to << "DATA_TYPE = "
<< param->getDataType()
- << endl;
+ << std::endl;
to << "DATA_SHAPE = "
<< param->getDataShape()
- << endl;
+ << std::endl;
}
else
{
to << "DATA_TYPE = "
<< param->getDataType()
- << endl;
+ << std::endl;
to << "DATA_SHAPE = "
<< param->getDataShape()
- << endl;
+ << std::endl;
}
- to << endl;
+ to << std::endl;
}
XtVaGetValues(this->num_outputs_stepper, XmNiValue, &num_outputs, NULL);
@@ -3060,17 +3065,17 @@
to << "OUTPUT = "
<< param->getName()
- << endl;
+ << std::endl;
if(param->getDescription()) {
to << "DESCRIPTION = "
<< param->getDescription()
- << endl;
+ << std::endl;
}
else {
to << "DESCRIPTION = "
<< " "
- << endl;
+ << std::endl;
}
param_type = param->getType();
@@ -3093,39 +3098,39 @@
}
}
if(!first)
- to << endl;
+ to << std::endl;
to << "STRUCTURE = "
<< param->getStructure()
- << endl;
+ << std::endl;
to << "DATA_TYPE = "
<< param->getDataType()
- << endl;
+ << std::endl;
to << "DATA_SHAPE = "
<< param->getDataShape()
- << endl;
+ << std::endl;
if(!EqualString(param->getStructure(), "Value"))
{
to << "POSITIONS = "
<< param->getPositions()
- << endl;
+ << std::endl;
to << "CONNECTIONS = "
<< param->getConnections()
- << endl;
+ << std::endl;
to << "ELEMENT_TYPE = "
<< param->getElementType()
- << endl;
+ << std::endl;
to << "DEPENDENCY = "
<< param->getDependency()
- << endl;
+ << std::endl;
}
- to << endl;
+ to << std::endl;
}
theMBApplication->setClean();
@@ -3326,7 +3331,7 @@
param = NULL;
- ifstream from(filenm);
+ std::ifstream from(filenm);
if(!from)
{
WarningMessage("File open failed.");
@@ -4041,7 +4046,7 @@
{
sprintf(dest_file,"%s/%s.c", path, fname);
// Open for input
- ifstream *from = new ifstream(dest_file);
+ std::ifstream *from = new std::ifstream(dest_file);
if(!from->fail())
{
c_exists = TRUE;
@@ -4051,7 +4056,7 @@
from->close();
// Make sure the file is writable
- ofstream *to = new ofstream(dest_file, ios::app);
+ std::ofstream *to = new std::ofstream(dest_file, std::ios::app);
if(to->fail())
{
ErrorMessage("File: %s is not writeable!", dest_file);
@@ -4063,7 +4068,7 @@
{
sprintf(dest_file,"%s/%s.mdf", path, fname);
// Open for input
- ifstream *from = new ifstream(dest_file);
+ std::ifstream *from = new std::ifstream(dest_file);
if(!from->fail())
{
mdf_exists = TRUE;
@@ -4073,7 +4078,7 @@
from->close();
// Make sure the file is writable
- ofstream *to = new ofstream(dest_file, ios::app);
+ std::ofstream *to = new std::ofstream(dest_file, std::ios::app);
if(to->fail())
{
ErrorMessage("File: %s is not writeable!", dest_file);
@@ -4085,7 +4090,7 @@
{
sprintf(dest_file,"%s/%s.make", path, fname);
// Open for input
- ifstream *from = new ifstream(dest_file);
+ std::ifstream *from = new std::ifstream(dest_file);
if(!from->fail())
{
makefile_exists = TRUE;
@@ -4095,7 +4100,7 @@
from->close();
// Make sure the file is writable
- ofstream *to = new ofstream(dest_file, ios::app);
+ std::ofstream *to = new std::ofstream(dest_file, std::ios::app);
if(to->fail())
{
ErrorMessage("File: %s is not writeable!", dest_file);
Index: src/uipp/prompter/Browser.C
===================================================================
RCS file: /src/master/dx/src/uipp/prompter/Browser.C,v
retrieving revision 1.18
diff -u -r1.18 Browser.C
--- src/uipp/prompter/Browser.C 25 Mar 2002 23:43:16 -0000 1.18
+++ src/uipp/prompter/Browser.C 22 Oct 2002 12:15:08 -0000
@@ -31,8 +31,6 @@
#include "../base/ButtonInterface.h"
#include "../base/DXStrings.h"
-#include <fstream.h>
-#include <iostream.h>
#include <sys/stat.h>
#if HAVE_REGCOMP && HAVE_REGEX_H
@@ -974,16 +972,16 @@
//
while (offset < this->file_size)
{
- this->from->seekg((streampos)offset);
+ this->from->seekg((std::streampos)offset);
if(!this->from)
{
- cerr << "Seekg failed in Browser::gotoLine()" << endl;
+ std::cerr << "Seekg failed in Browser::gotoLine()" << std::endl;
break;
}
this->from->read(buf, this->page_size);
if(!this->from)
{
- cerr << "Read failed in Browser::gotoLine()" << endl;
+ std::cerr << "Read failed in Browser::gotoLine()" << std::endl;
break;
}
if(this->from->fail()) this->from->clear();
@@ -1330,7 +1328,7 @@
struct STATSTRUCT statb;
char title[512];
- this->from = new ifstream(filenm);
+ this->from = new std::ifstream(filenm);
if(!this->from)
{
WarningMessage("File open failed for file %s", filenm);
@@ -1374,15 +1372,15 @@
//
// Read in a buffer
//
- this->from->seekg((streampos)file_offset);
+ this->from->seekg((std::streampos)file_offset);
if(!this->from)
{
- cerr << "Seekg failed in Browser::loadBuffer()" << endl;
+ std::cerr << "Seekg failed in Browser::loadBuffer()" << std::endl;
}
this->from->read(buf, this->page_size);
if(!this->from)
{
- cerr << "Read failed in Browser::loadBuffer()" << endl;
+ std::cerr << "Read failed in Browser::loadBuffer()" << std::endl;
}
if(this->from->fail()) this->from->clear();
@@ -1427,10 +1425,10 @@
//
// Calc the line number offset of this position
//
- this->from->seekg((streampos)0);
+ this->from->seekg((std::streampos)0);
if(!this->from)
{
- cerr << "Seekg failed in Browser::loadBuffer()" << endl;
+ std::cerr << "Seekg failed in Browser::loadBuffer()" << std::endl;
}
int offset = 0;
this->page_start_line_no = 0;
@@ -1439,7 +1437,7 @@
this->from->getline(linebuf, this->page_size);
if(!this->from)
{
- cerr << "Getline failed in Browser::gotoLine()" << endl;
+ std::cerr << "Getline failed in Browser::gotoLine()" << std::endl;
break;
}
// Add one, since getline does not get the '\n'
@@ -1507,15 +1505,15 @@
//
// Read in a buffer
//
- this->from->seekg((streampos)pos);
+ this->from->seekg((std::streampos)pos);
if(!this->from)
{
- cerr << "Seekg failed in Browser::searchForward()" << endl;
+ std::cerr << "Seekg failed in Browser::searchForward()" <<
std::endl;
}
this->from->read(buf, this->page_size);
if(!this->from)
{
- cerr << "Read failed in Browser::searchForward()" << endl;
+ std::cerr << "Read failed in Browser::searchForward()" << std::endl;
}
if(this->from->fail()) this->from->clear();
@@ -1689,15 +1687,15 @@
//
// Read in a buffer
//
- this->from->seekg((streampos)bufstart);
+ this->from->seekg((std::streampos)bufstart);
if(!this->from)
{
- cerr << "Seekg failed in Browser::searchBackward()" << endl;
+ std::cerr << "Seekg failed in Browser::searchBackward()" <<
std::endl;
}
this->from->read(buf, this->page_size);
if(!this->from)
{
- cerr << "Read failed in Browser::searchBackward()" << endl;
+ std::cerr << "Read failed in Browser::searchBackward()" <<
std::endl;
}
if(this->from->fail()) this->from->clear();
Index: src/uipp/prompter/Browser.h
===================================================================
RCS file: /src/master/dx/src/uipp/prompter/Browser.h,v
retrieving revision 1.6
diff -u -r1.6 Browser.h
--- src/uipp/prompter/Browser.h 20 May 2000 17:49:42 -0000 1.6
+++ src/uipp/prompter/Browser.h 22 Oct 2002 12:15:08 -0000
@@ -14,7 +14,14 @@
#ifndef _Browser_h
#define _Browser_h
+#if defined(HAVE_FSTREAM)
+#include <fstream>
+#elif defined(HAVE_FSTREAM_H)
#include <fstream.h>
+#else /* !HAVE_FSTREAM && !HAVE_FSTREAM_H */
+#error "no fstream and no fstream.h"
+#endif /* !HAVE_FSTREAM && !HAVE_FSTREAM_H */
+
#include <Xm/Xm.h>
#include "../base/IBMMainWindow.h"
#include "../base/CommandInterface.h"
@@ -44,7 +51,7 @@
//
// Source file stream
//
- ifstream *from;
+ std::ifstream *from;
unsigned long file_size;
int page_size;
Index: src/uipp/prompter/GARApplication.C
===================================================================
RCS file: /src/master/dx/src/uipp/prompter/GARApplication.C,v
retrieving revision 1.14
diff -u -r1.14 GARApplication.C
--- src/uipp/prompter/GARApplication.C 30 May 2001 14:01:23 -0000 1.14
+++ src/uipp/prompter/GARApplication.C 22 Oct 2002 12:15:09 -0000
@@ -14,13 +14,6 @@
#include <Xm/Xm.h>
#include <Xm/Label.h>
#include <X11/cursorfont.h>
-#ifdef DXD_WIN
-#include <iostream.h>
-#else
-#if defined(HAVE_STREAM_H)
-#include <stream.h>
-#endif
-#endif
#include <sys/types.h>
#include <sys/stat.h>
@@ -382,7 +375,7 @@
// The old mode may be the same as the new mode (if we are simply opening
// a new file.
//
-void GARApplication::changeMode(unsigned long mode, istream *tmpstr)
+void GARApplication::changeMode(unsigned long mode, std::istream *tmpstr)
{
GARMainWindow *old_mw = NULL;
Boolean change_it = (mode != this->mainWindow->getMode());
Index: src/uipp/prompter/GARApplication.h
===================================================================
RCS file: /src/master/dx/src/uipp/prompter/GARApplication.h,v
retrieving revision 1.11
diff -u -r1.11 GARApplication.h
--- src/uipp/prompter/GARApplication.h 25 Mar 2002 23:43:17 -0000 1.11
+++ src/uipp/prompter/GARApplication.h 22 Oct 2002 12:15:09 -0000
@@ -12,12 +12,12 @@
#ifndef _GARApplication_h
#define _GARApplication_h
-#if defined(HAVE_STRSTREAM_H)
+#if defined(HAVE_SSTREAM)
+#include <sstream>
+#elif defined(HAVE_STRSTREAM_H)
#include <strstream.h>
#endif
-#include <iostream.h>
-
#if defined(HAVE_STRSTREA_H)
#include <strstrea.h>
#endif
@@ -163,7 +163,7 @@
void setDirty();
void setClean();
- void changeMode(unsigned long, istream *);
+ void changeMode(unsigned long, std::istream *);
const char *getResourcesExec() { return this->resource.exec; }
int getResourcesPort() { return this->resource.port; }
Index: src/uipp/prompter/GARCommand.C
===================================================================
RCS file: /src/master/dx/src/uipp/prompter/GARCommand.C,v
retrieving revision 1.7
diff -u -r1.7 GARCommand.C
--- src/uipp/prompter/GARCommand.C 22 Mar 2002 23:27:54 -0000 1.7
+++ src/uipp/prompter/GARCommand.C 22 Oct 2002 12:15:10 -0000
@@ -13,7 +13,9 @@
#include <Xm/Xm.h>
-#if defined(HAVE_STRSTREAM_H)
+#if defined(HAVE_SSTREAM)
+#include <sstream>
+#elif defined(HAVE_STRSTREAM_H)
#include <strstream.h>
#elif defined(HAVE_STRSTREA_H)
#include <strstrea.h>
@@ -50,10 +52,18 @@
char *fname;
unsigned long mode;
int dirty;
+#if defined(HAVE_SSTREAM)
+ std::stringstream tmpstr;
+#else
strstream tmpstr;
+#endif
#ifdef aviion
+#if defined(HAVE_SSTREAM)
+ std::stringstream tmpstr2;
+#else
strstream tmpstr2;
#endif
+#endif
switch (this->option)
{
@@ -100,7 +110,7 @@
theGARApplication->changeMode(mode, &tmpstr2);
#else
tmpstr.clear();
- tmpstr.seekg(0, ios::beg);
+ tmpstr.seekg(0, std::ios::beg);
theGARApplication->changeMode(mode, &tmpstr);
#endif
if (dirty) theGARApplication->setDirty();
Index: src/uipp/prompter/GARMainWindow.C
===================================================================
RCS file: /src/master/dx/src/uipp/prompter/GARMainWindow.C,v
retrieving revision 1.10
diff -u -r1.10 GARMainWindow.C
--- src/uipp/prompter/GARMainWindow.C 22 Mar 2002 23:27:55 -0000 1.10
+++ src/uipp/prompter/GARMainWindow.C 22 Oct 2002 12:15:20 -0000
@@ -12,8 +12,14 @@
#include <ctype.h>
+
+#if defined(HAVE_FSTREAM)
+#include <fstream>
+#elif defined (HAVE_FSTREAM_H)
#include <fstream.h>
-#include <iostream.h>
+#else
+#error "no fstream and no fstream.h"
+#endif
#include <Xm/Xm.h>
#include <Xm/CascadeB.h>
@@ -2424,7 +2430,7 @@
unsigned long GARMainWindow::getMode(char *filenm)
{
- ifstream *from = new ifstream(filenm);
+ std::ifstream *from = new std::ifstream(filenm);
if(!*from)
{
WarningMessage("File open failed in getMode");
@@ -2433,7 +2439,7 @@
return getMode(from);
}
-unsigned long GARMainWindow::getMode(istream *from)
+unsigned long GARMainWindow::getMode(std::istream *from)
{
int num_error = 0;
int ndx, ndim;
@@ -6070,7 +6076,7 @@
if(!validateGAR()) return False;
- ofstream *to = new ofstream(file);
+ std::ofstream *to = new std::ofstream(file);
if(!*to)
{
WarningMessage("File open failed on save");
@@ -6080,7 +6086,7 @@
saveGAR(to);
return True;
}
-void GARMainWindow::saveGAR(ostream *to)
+void GARMainWindow::saveGAR(std::ostream *to)
{
int i;
int k;
@@ -6111,11 +6117,11 @@
if(this->comment_text[i+1]) *to << "# ";
i++;
}
- *to << endl;
+ *to << std::endl;
}
- *to << "file = " << XmTextGetString(this->file_text) << endl;
+ *to << "file = " << XmTextGetString(this->file_text) << std::endl;
if(XmToggleButtonGetState(this->grid_tb))
{
@@ -6127,7 +6133,7 @@
{
*to << "points = " << XmTextGetString(this->points_text);
}
- *to << endl;
+ *to << std::endl;
*to << "format = ";
if(XtIsSensitive(this->format1_om))
@@ -6136,7 +6142,7 @@
*to << " ";
}
OM_NAME_OUT(*to, this->format2_om);
- *to << endl;
+ *to << std::endl;
//
// Interleaving translation:
@@ -6199,7 +6205,7 @@
*to << "record";
}
}
- *to << endl;
+ *to << std::endl;
if(XtIsSensitive(this->majority_label))
{
@@ -6208,7 +6214,7 @@
*to << "row";
else
*to << "column";
- *to << endl;
+ *to << std::endl;
}
if(XmToggleButtonGetState(this->header_tb))
@@ -6230,12 +6236,12 @@
{
str = XmTextGetString(this->header_text);
STRIP_QUOTES(str);
- *to << " \"" << str << "\"" << endl;
+ *to << " \"" << str << "\"" << std::endl;
XtFree(str);
}
else
{
- *to << " " << XmTextGetString(this->header_text) << endl;
+ *to << " " << XmTextGetString(this->header_text) << std::endl;
}
}
@@ -6282,7 +6288,7 @@
*to << " " << XmTextGetString(this->series_sep_text);
}
}
- *to << endl;
+ *to << std::endl;
}
//
@@ -6300,7 +6306,7 @@
*to << field->getName();
if(i < this->fieldList.getSize()) *to << ", ";
}
- *to << endl;
+ *to << std::endl;
//
// Structure
@@ -6312,7 +6318,7 @@
*to << field->getStructure();
if(i < this->fieldList.getSize()) *to << ", ";
}
- *to << endl;
+ *to << std::endl;
//
// Type
@@ -6324,7 +6330,7 @@
*to << field->getType();
if(i < this->fieldList.getSize()) *to << ", ";
}
- *to << endl;
+ *to << std::endl;
//
// Dependency
@@ -6338,7 +6344,7 @@
*to << field->getDependency();
if(i < this->fieldList.getSize()) *to << ", ";
}
- *to << endl;
+ *to << std::endl;
}
//
@@ -6356,7 +6362,7 @@
<< field->getLayoutWidth();
if(i < this->fieldList.getSize()) *to << ", ";
}
- *to << endl;
+ *to << std::endl;
}
@@ -6376,7 +6382,7 @@
<< field->getBlockWidth();
if(i < this->fieldList.getSize()) *to << ", ";
}
- *to << endl;
+ *to << std::endl;
}
}
@@ -6444,9 +6450,9 @@
*to << ", ";
}
- *to << endl;
+ *to << std::endl;
}
- *to << endl;
+ *to << std::endl;
}
//
@@ -6481,10 +6487,10 @@
*to << ", ";
}
}
- *to << endl;
+ *to << std::endl;
}
- *to << endl << "end" << endl;
+ *to << std::endl << "end" << std::endl;
theGARApplication->setClean();
}
@@ -6805,7 +6811,7 @@
{
this->setFilename(filenm);
- ifstream *from = new ifstream(filenm);
+ std::ifstream *from = new std::ifstream(filenm);
if(!*from)
{
WarningMessage("File open failed.");
@@ -6819,7 +6825,7 @@
return TRUE;
}
-boolean GARMainWindow::openGAR(istream *from)
+boolean GARMainWindow::openGAR(std::istream *from)
{
int i;
int ndx;
@@ -7438,7 +7444,7 @@
XmToggleButtonSetState(this->block_tb, True, False);
this->block_was_on = True;
}
-void GARMainWindow::parsePositions(istream *from, char *line)
+void GARMainWindow::parsePositions(std::istream *from, char *line)
{
char *str;
char *tmpstr;
Index: src/uipp/prompter/GARMainWindow.h
===================================================================
RCS file: /src/master/dx/src/uipp/prompter/GARMainWindow.h,v
retrieving revision 1.8
diff -u -r1.8 GARMainWindow.h
--- src/uipp/prompter/GARMainWindow.h 25 Mar 2002 23:43:18 -0000 1.8
+++ src/uipp/prompter/GARMainWindow.h 22 Oct 2002 12:15:22 -0000
@@ -14,8 +14,12 @@
#ifndef _GARMainWindow_h
#define _GARMainWindow_h
-#include <iostream.h>
+#if defined(HAVE_FSTREAM)
+#include <fstream>
+#elif defined(HAVE_FSTREAM_H)
#include <fstream.h>
+#endif
+
#include <Xm/Xm.h>
#include "../base/lex.h"
@@ -403,7 +407,7 @@
void parseMajority(char *line);
void parseLayout(char *line);
void parseBlock(char *line);
- void parsePositions(istream *from, char *line);
+ void parsePositions(std::istream *from, char *line);
void parseComment(char *line);
void parseDependency(char *line);
void parseRecordSep(char *line);
@@ -475,14 +479,14 @@
void newGAR();
void newGAR(unsigned long mode);
boolean saveGAR(char *filenm);
- void saveGAR(ostream *);
+ void saveGAR(std::ostream *);
boolean openGAR(char *filenm);
- boolean openGAR(istream *);
+ boolean openGAR(std::istream *);
unsigned long getMode(){return this->mode;};
static unsigned long getMode(char *filenm);
- static unsigned long getMode(istream *);
+ static unsigned long getMode(std::istream *);
void postOpenFileDialog();
void postBrowser(char *filenm);
Index: src/uipp/prompter/OpenFileDialog.C
===================================================================
RCS file: /src/master/dx/src/uipp/prompter/OpenFileDialog.C,v
retrieving revision 1.7
diff -u -r1.7 OpenFileDialog.C
--- src/uipp/prompter/OpenFileDialog.C 22 May 2000 16:03:02 -0000 1.7
+++ src/uipp/prompter/OpenFileDialog.C 22 Oct 2002 12:15:22 -0000
@@ -38,9 +38,9 @@
void OpenFileDialog::okFileWork(const char *filenm)
{
- ifstream *from = new ifstream(filenm);
+ std::ifstream *from = new std::ifstream(filenm);
#ifdef aviion
- ifstream *from2 = new ifstream(filenm);
+ std::ifstream *from2 = new std::ifstream(filenm);
#endif
if(!from)
{
@@ -54,7 +54,7 @@
theGARApplication->changeMode(mode, from2);
#else
from->clear();
- from->seekg(0, ios::beg);
+ from->seekg(0, std::ios::beg);
theGARApplication->changeMode(mode, from);
#endif
Index: src/uipp/startup/StartupApplication.C
===================================================================
RCS file: /src/master/dx/src/uipp/startup/StartupApplication.C,v
retrieving revision 1.12
diff -u -r1.12 StartupApplication.C
--- src/uipp/startup/StartupApplication.C 23 May 2000 19:01:01 -0000
1.12
+++ src/uipp/startup/StartupApplication.C 22 Oct 2002 12:15:23 -0000
@@ -14,11 +14,6 @@
#include <Xm/Label.h>
#include <X11/cursorfont.h>
-#if defined(HAVE_STRSTREAM_H)
-#include <strstream.h>
-#elif defined(HAVE_STRSTREA_H)
-#include <strstrea.h>
-#endif
#if defined(HAVE_UNISTD_H)
#include <unistd.h>
Index: src/uipp/startup/StartupApplication.h
===================================================================
RCS file: /src/master/dx/src/uipp/startup/StartupApplication.h,v
retrieving revision 1.8
diff -u -r1.8 StartupApplication.h
--- src/uipp/startup/StartupApplication.h 16 May 2000 18:53:09 -0000
1.8
+++ src/uipp/startup/StartupApplication.h 22 Oct 2002 12:15:23 -0000
@@ -15,8 +15,12 @@
-#if defined(HAVE_STRSTREAM_H)
+#if defined(HAVE_SSTREAM)
+#include <sstream>
+#elif defined(HAVE_STRSTREAM_H)
#include <strstream.h>
+#elif defined(HAVE_STRSTREA_H)
+#include <strstrea.h>
#endif
#if defined(HAVE_STRSTREA_H)
Index: src/uipp/startup/StartupCommand.C
===================================================================
RCS file: /src/master/dx/src/uipp/startup/StartupCommand.C,v
retrieving revision 1.6
diff -u -r1.6 StartupCommand.C
--- src/uipp/startup/StartupCommand.C 20 May 2000 17:49:52 -0000 1.6
+++ src/uipp/startup/StartupCommand.C 22 Oct 2002 12:15:23 -0000
@@ -13,9 +13,12 @@
#include <Xm/Xm.h>
-#if !defined(OS2) && !defined(DXD_WIN)
+
+#if defined(HAVE_SSTREAM)
+#include <sstream>
+#elif defined(HAVE_STRSTREAM_H)
#include <strstream.h>
-#else
+#elif defined(HAVE_STRSTREA_H)
#include <strstrea.h>
#endif
