tags 455399 + patch thanks Attached is a proposed diff for a magnus 20060324-5.1 NMU.
Regards,
Simon
diff -u magnus-20060324/back_end/libg++/include/Integer.h magnus-20060324/back_end/libg++/include/Integer.h
--- magnus-20060324/back_end/libg++/include/Integer.h
+++ magnus-20060324/back_end/libg++/include/Integer.h
@@ -23,7 +23,11 @@
#endif
#define _Integer_h 1
-#include <iostream.h>
+#include <iostream>
+
+using std::istream;
+using std::ostream;
+
#undef OK
diff -u magnus-20060324/back_end/black_boxes/tc5/print_ct.c magnus-20060324/back_end/black_boxes/tc5/print_ct.c
--- magnus-20060324/back_end/black_boxes/tc5/print_ct.c
+++ magnus-20060324/back_end/black_boxes/tc5/print_ct.c
@@ -1,6 +1,8 @@
/* File print_ct.c */
#include "print_ct.h"
#include <string.h>
+#include <stdlib.h>
+
#define CT_T(i,j) ct[(i-1) * NCOL + j + 1]
Void
tc_print_ct(n1, n2, n3, tc_pvar)
diff -u magnus-20060324/back_end/general/src/BlackBox.C magnus-20060324/back_end/general/src/BlackBox.C
--- magnus-20060324/back_end/general/src/BlackBox.C
+++ magnus-20060324/back_end/general/src/BlackBox.C
@@ -17,6 +17,8 @@
#include "List.h"
#include <errno.h>
+using std::ends;
+
ListOf< BlackBox* > BlackBox_known_BBs;
//@am Compiler complains about not
diff -u magnus-20060324/debian/changelog magnus-20060324/debian/changelog
--- magnus-20060324/debian/changelog
+++ magnus-20060324/debian/changelog
@@ -1,3 +1,15 @@
+magnus (20060324-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc 4.3 (closes: #455399):
+ - #include <iostream> instead of <iostream.h>, etc.
+ - #include assorted missing stdlib headers
+ - using std::foo
+ - don't re-#define RAND_MAX if the platform defines it correctly (which
+ we do)
+
+ -- Simon McVittie <[EMAIL PROTECTED]> Sat, 05 Apr 2008 20:33:52 +0000
+
magnus (20060324-5) unstable; urgency=low
* Updated for new debian menu layout. Menu entry has moved from Apps/Math
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Subgroup/test/debug-Subgroup.C
+++ magnus-20060324/back_end/Subgroup/test/debug-Subgroup.C
@@ -12,7 +12,7 @@
#include "Subgroup.h"
-#include <iostream.h>
+#include <iostream>
main ( ) {
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Subgroup/src/DecomposeInSubgroup.C
+++ magnus-20060324/back_end/Subgroup/src/DecomposeInSubgroup.C
@@ -846,7 +846,7 @@
}
/*
-#include <iostream.h>
+#include <iostream>
//#include "CONDITION.h"
void debugMessage( int msgType, bool condition, const char *condDescription,
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/include/DCell.h
+++ magnus-20060324/back_end/general/include/DCell.h
@@ -16,7 +16,7 @@
#ifndef _DCELL_H_
#define _DCELL_H_
-#include <iostream.h>
+#include <iostream>
#include "IPC.h"
template<class T> class DCell {
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/include/Type.h
+++ magnus-20060324/back_end/general/include/Type.h
@@ -76,8 +76,12 @@
#define _TYPE_H_
-#include <iostream.h>
-
+#include <iostream>
+
+using std::istream;
+using std::ostream;
+
+
class Type {
public :
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/include/LogWatcher.h
+++ magnus-20060324/back_end/general/include/LogWatcher.h
@@ -13,10 +13,14 @@
#ifndef _LOG_WATCHER_H_
#define _LOG_WATCHER_H_
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
#include "Chars.h"
#include "Timer.h"
+using std::fstream;
+using std::ios;
+
const int WATCHER_BUF_SIZE = 4096;
class LogFileWatcher
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/include/Associations.h
+++ magnus-20060324/back_end/general/include/Associations.h
@@ -50,7 +50,7 @@
#include "List.h"
#include "Cell.h"
-#include <iostream.h>
+#include <iostream>
//---------------------- class Association ----------------------------------
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/include/BlackBox.h
+++ magnus-20060324/back_end/general/include/BlackBox.h
@@ -24,14 +24,18 @@
#include <unistd.h>
#include <string.h>
-#include <iostream.h>
+#include <iostream>
#include <strstream>
-#include <fstream.h>
+#include <fstream>
//#include <stdiostream.h>
#include "global.h"
#include "Chars.h"
+using std::ifstream;
+using std::ofstream;
+
+
extern "C" {
char* tempnam(const char*,const char*); // Lib functions SunOS doesn't declare.
}
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/include/File.h
+++ magnus-20060324/back_end/general/include/File.h
@@ -30,9 +30,15 @@
#include <stdio.h>
-#include <fstream.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <fstream>
#include "MagnusHome.h"
+using std::fstream;
+using std::ios;
+
+
// Colors have to be in form RGB,
// where R,G or B represents one hexademical digit of red,
// green or blue intensity, respectively.
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/include/Timer.h
+++ magnus-20060324/back_end/general/include/Timer.h
@@ -16,7 +16,7 @@
#include <sys/time.h>
-#include <iostream.h>
+#include <iostream>
#include <IPC.h>
#include "config.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/include/Cell.h
+++ magnus-20060324/back_end/general/include/Cell.h
@@ -18,7 +18,7 @@
//#include "Word.h"
-#include <iostream.h>
+#include <iostream>
#include "IPC.h"
//@njz:
#include "error.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/include/RandomNumbers.h
+++ magnus-20060324/back_end/general/include/RandomNumbers.h
@@ -20,7 +20,7 @@
#ifndef _RANDOMNUMBERS_H_
#define _RANDOMNUMBERS_H_
-#include <iostream.h>
+#include <iostream>
#include "IPC.h"
#include "Timer.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/include/QuickAssociations.h
+++ magnus-20060324/back_end/general/include/QuickAssociations.h
@@ -61,7 +61,7 @@
#include "List.h"
#include "Set.h"
-#include <iostream.h>
+#include <iostream>
//---------------------- class QuickAssociation -------------------------
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/test/debug-PureObject.C
+++ magnus-20060324/back_end/general/test/debug-PureObject.C
@@ -1,7 +1,7 @@
// Principal Author: Stephane Collart
-#include <iostream.h>
+#include <iostream>
#include "PureRep.h"
#include "PureObject.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/test/debug-ObjectOf.C
+++ magnus-20060324/back_end/general/test/debug-ObjectOf.C
@@ -3,7 +3,7 @@
#include "RefCounter.h"
#include "ObjectOf.h"
-#include <iostream.h>
+#include <iostream>
struct R : RefCounter {
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/test/debug-Vector.C
+++ magnus-20060324/back_end/general/test/debug-Vector.C
@@ -1,6 +1,6 @@
// Informal tests of class VectorOf<T>
-#include <iostream.h>
+#include <iostream>
#include "Vector.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/test/debug-Type.C
+++ magnus-20060324/back_end/general/test/debug-Type.C
@@ -14,7 +14,7 @@
#include "PureRep.h"
#include "PureObject.h"
-#include <iostream.h>
+#include <iostream>
struct AR : PureRep {
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/general/src/Chars.C
+++ magnus-20060324/back_end/general/src/Chars.C
@@ -16,6 +16,10 @@
#include "Chars.h"
#include <stdio.h>
+using std::ios;
+using std::streambuf;
+
+
//------------------------------------------------------------------------//
//---------------------------- CharsRep ----------------------------------//
//------------------------------------------------------------------------//
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/KB/include/KBmagPackage.h
+++ magnus-20060324/back_end/KB/include/KBmagPackage.h
@@ -22,7 +22,7 @@
#ifndef _KBmagPackage_H_
#define _KBmagPackage_H_
-#include <iomanip.h>
+#include <iomanip>
#include "Vector.h"
#include "Chars.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/KB/include/RKBPackage.h
+++ magnus-20060324/back_end/KB/include/RKBPackage.h
@@ -20,7 +20,7 @@
#ifndef _RKBPackage_H_
#define _RKBPackage_H_
-#include <iomanip.h>
+#include <iomanip>
#include "BlackBox.h"
#include "Vector.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/KB/src/GenMultRep.C
+++ magnus-20060324/back_end/KB/src/GenMultRep.C
@@ -10,7 +10,7 @@
// Revision History:
//
-#include <iostream.h>
+#include <iostream>
#include <string.h>
#include "List.h"
#include "GenMultRep.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/KB/src/KBMachineRep.C
+++ magnus-20060324/back_end/KB/src/KBMachineRep.C
@@ -12,7 +12,7 @@
// 12/07/94 @rn Rewrote KBMachineRep::sizeLanguage.
-#include <iostream.h>
+#include <iostream>
#include <string.h>
#include "Word.h"
#include "KBMachineRep.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/KB/src/DiffMachineRep.C
+++ magnus-20060324/back_end/KB/src/DiffMachineRep.C
@@ -12,7 +12,7 @@
// * 8/96 Dmitry B. made porting to gcc 2.7.2.
//
-#include <iostream.h>
+#include <iostream>
#include <string.h>
#include "Set.h"
#include "Word.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/TietzeTrek/GLvarSub/FpTree.C
+++ magnus-20060324/back_end/black_boxes/TietzeTrek/GLvarSub/FpTree.C
@@ -20,6 +20,7 @@
#include "Ftime.h"
#include "nodeMsg.h"
+using std::cout;
// standard methods for FpTree
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/TietzeTrek/TTdriverDebug/operators.C
+++ magnus-20060324/back_end/black_boxes/TietzeTrek/TTdriverDebug/operators.C
@@ -12,11 +12,16 @@
#include "GLfunctions.h"
#ifndef Frank_GenuineMac
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
+using std::ofstream;
+
extern ofstream fout;
#endif
+using std::endl;
+using std::ostream;
+
extern ostream &gout;
extern ostream &memout;
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/TietzeTrek/TTdriverDebug/FTietzeDoc.C
+++ magnus-20060324/back_end/black_boxes/TietzeTrek/TTdriverDebug/FTietzeDoc.C
@@ -23,6 +23,9 @@
#include <stdio.h>
+using std::cin;
+using std::cout;
+
FTietzeDoc::FTietzeDoc(void){
itsTietzeNode=0;
itsStrings=0;
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/TietzeTrek/TTdriverDebug/crossTrainer.h
+++ magnus-20060324/back_end/black_boxes/TietzeTrek/TTdriverDebug/crossTrainer.h
@@ -18,10 +18,13 @@
// hidden by using the <= operators instead of the << operators. In all
// versions, <= streams to both file and windown.
-#include <fstream.h>
+#include <fstream>
+using std::ofstream;
+
extern ofstream fout;
#endif
+using std::ostream;
extern ostream &memout;
extern ostream &tout;
extern ostream &gout;
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/TietzeTrek/TTdriverDebug/TietzeGlobals.C
+++ magnus-20060324/back_end/black_boxes/TietzeTrek/TTdriverDebug/TietzeGlobals.C
@@ -28,6 +28,8 @@
ofstream fout("/dev/null");
#endif
+using std::cout;
+
ostream &memout=cout; // defaults for debugging streams
ostream &gout=cout; // you can reroute these if desired
ostream &tout=cout; // but you'll have to write some support code.
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/TietzeTrek/TTdriverDebug/operators.h
+++ magnus-20060324/back_end/black_boxes/TietzeTrek/TTdriverDebug/operators.h
@@ -26,7 +26,7 @@
typedef FrankStream ostream;
#else
-#include <iostream.h>
+#include <iostream>
#endif
void operator+(FGLvarInterface *v,const GLref& ref);
@@ -39,6 +39,8 @@
// in the SUN version. The Mac version is controlled dynamically
// by the user.
+using std::ostream;
+
ostream& operator<=(ostream& s,const Str255 str);
ostream& operator<=(ostream& s,const char* str);
ostream& operator<=(ostream& s,const short num);
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/TietzeTrek/GLink/FBlockManager.h
+++ magnus-20060324/back_end/black_boxes/TietzeTrek/GLink/FBlockManager.h
@@ -11,9 +11,11 @@
#ifdef Frank_GenuineMac
#include "operators.h"
#else
-#include <iostream.h>
+#include <iostream>
#endif
+using std::ostream;
+
class FGLink;
class FBlockManager: public FList{
private:
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/TietzeTrek/GLink/FdebugNode.C
+++ magnus-20060324/back_end/black_boxes/TietzeTrek/GLink/FdebugNode.C
@@ -4,6 +4,9 @@
#include "FdebugNode.h"
#include "FGLstepper.h"
+
+using std::cout;
+
FdebugNode::FdebugNode(ostream& s,FGLvar *v)
:FGLwalkNode(ZERO,v){
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/TietzeTrek/GLink/debugGLink.C
+++ magnus-20060324/back_end/black_boxes/TietzeTrek/GLink/debugGLink.C
@@ -4,6 +4,7 @@
#include "FdebugNode.h"
#include "FfoldStepper.h"
+using std::cout;
ostream& repReg(ostream& s,FGLvarInterface *v){
if(xDEBUG){
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/TietzeTrek/GLink/GLfunctions.C
+++ magnus-20060324/back_end/black_boxes/TietzeTrek/GLink/GLfunctions.C
@@ -304,9 +304,8 @@
}
#include <math.h>
-#ifdef THINK_CPLUS
#include <stdlib.h>
-#else
+#ifndef RAND_MAX
// RAND_MAX is not defined in <stdlib.h> on the SUN
#include <limits.h>
#define RAND_MAX LONG_MAX
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/TietzeTrek/Fclasses/FArray.C
+++ magnus-20060324/back_end/black_boxes/TietzeTrek/Fclasses/FArray.C
@@ -3,7 +3,7 @@
#include "operators.h"
#ifndef Frank_GenuineMac
#include "FtoolBox.h"
-#include <iostream.h>
+#include <iostream>
#endif
extern ostream &memout;
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/TietzeTrek/Fclasses/FCluster.C
+++ magnus-20060324/back_end/black_boxes/TietzeTrek/Fclasses/FCluster.C
@@ -3,7 +3,7 @@
#include "FtoolBox.h"
#include "operators.h"
#ifndef Frank_GenuineMac
-#include <iostream.h>
+#include <iostream>
#endif
FCluster::FCluster()
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/orwp/orwp.C
+++ magnus-20060324/back_end/black_boxes/orwp/orwp.C
@@ -21,10 +21,16 @@
//
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <stdlib.h>
-#include <new.h>
+#include <new>
+
+using std::cerr;
+using std::cin;
+using std::cout;
+using std::endl;
+
// #define INFILE
//#define VERBOSE_MODE
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/vector.C
+++ magnus-20060324/back_end/black_boxes/rkbp/source/vector.C
@@ -3,6 +3,8 @@
#include "rkbp.h"
+using std::cout;
+using std::endl;
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/chunk.C
+++ magnus-20060324/back_end/black_boxes/rkbp/source/chunk.C
@@ -2,6 +2,9 @@
#include "rkbp.h"
+using std::cout;
+using std::endl;
+
static chunk *head_chunk = NULL;
static long nfree = 0;
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/fxmem.C
+++ magnus-20060324/back_end/black_boxes/rkbp/source/fxmem.C
@@ -38,6 +38,11 @@
#include <malloc.h>
#endif
+#include <iostream>
+
+using std::cout;
+using std::endl;
+using std::setw;
/* Each block allocated by malloc is prefixed with a bucket whose
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/rkbp.h
+++ magnus-20060324/back_end/black_boxes/rkbp/source/rkbp.h
@@ -2,9 +2,9 @@
#include <stdio.h>
-#include <iostream.h>
-#include <iomanip.h>
-#include <fstream.h>
+#include <iostream>
+#include <iomanip>
+#include <fstream>
#include <ctype.h>
#include <limits.h>
#include <string.h>
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/system.h
+++ magnus-20060324/back_end/black_boxes/rkbp/source/system.h
@@ -1,5 +1,11 @@
// system.h
+#include <fstream>
+#include <ios>
+
+using std::ios;
+using std::ofstream;
+
enum alphabet_type {GROUP, MONOID};
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/array.h
+++ magnus-20060324/back_end/black_boxes/rkbp/source/array.h
@@ -1,5 +1,8 @@
// array.h
+#include <iostream>
+
+using std::istream;
/*
This file defines the following struct's and classes:
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/integer.C
+++ magnus-20060324/back_end/black_boxes/rkbp/source/integer.C
@@ -16,7 +16,7 @@
*/
-#include <iostream.h>
+#include <iostream>
#include <limits.h>
#include "portable.h"
#include "utility.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/subsystm.C
+++ magnus-20060324/back_end/black_boxes/rkbp/source/subsystm.C
@@ -3,6 +3,13 @@
#include "rkbp.h"
+using std::cin;
+using std::cout;
+using std::endl;
+using std::ifstream;
+using std::setw;
+
+
extern double hybrid_factor;
extern ulong mask[33];
extern long print_level;
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/utility.h
+++ magnus-20060324/back_end/black_boxes/rkbp/source/utility.h
@@ -7,7 +7,9 @@
#define NO (response() == FALSE)
#define YES (response() == TRUE)
+#include <istream>
+using std::istream;
extern _boolean_t bool_t( int );
extern void compress_file(char *);
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/vector.h
+++ magnus-20060324/back_end/black_boxes/rkbp/source/vector.h
@@ -1,5 +1,16 @@
// vector.h
+#include <fstream>
+#include <istream>
+#include <ostream>
+#include <ios>
+
+using std::fstream;
+using std::istream;
+using std::ostream;
+using std::ios;
+
+
/////////////////////////////////////////////////////////////////
//
// vector_char
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/system.C
+++ magnus-20060324/back_end/black_boxes/rkbp/source/system.C
@@ -3,6 +3,13 @@
#include "rkbp.h"
+using std::cin;
+using std::cout;
+using std::endl;
+using std::ifstream;
+using std::setw;
+
+
extern double hybrid_factor;
extern ulong mask[33];
extern long pack_size[12];
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/utility.C
+++ magnus-20060324/back_end/black_boxes/rkbp/source/utility.C
@@ -5,6 +5,10 @@
#include "rkbp.h"
+using std::cin;
+using std::cout;
+using std::endl;
+
// The following are used in the recording of elapsed cpu time.
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/dots.C
+++ magnus-20060324/back_end/black_boxes/rkbp/source/dots.C
@@ -21,11 +21,12 @@
#include <stdio.h>
-#include <iostream.h>
+#include <iostream>
#include "portable.h"
#include "utility.h"
#include "dots.h"
+using std::cout;
// Variables defining the printing of dots.
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/black_boxes/rkbp/source/rkbp.C
+++ magnus-20060324/back_end/black_boxes/rkbp/source/rkbp.C
@@ -2,6 +2,12 @@
#include "rkbp.h"
+using std::cin;
+using std::cout;
+using std::endl;
+using std::setprecision;
+using std::setw;
+
static long nargs;
static char *args[20];
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/include/RandomDefinitionsGenerator.h
+++ magnus-20060324/back_end/SessionManager/include/RandomDefinitionsGenerator.h
@@ -18,7 +18,7 @@
#include "FPGroup.h"
#include "Chars.h"
#include "ViewContents.h"
-#include <iostream.h>
+#include <iostream>
// ------------------------------------ RandomDefinitionGenerate -----------------------------------
class RandomDefinitionGenerate
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/include/ViewContents.h
+++ magnus-20060324/back_end/SessionManager/include/ViewContents.h
@@ -23,7 +23,7 @@
#include "Chars.h"
#include "Word.h"
-#include "iostream.h"
+#include <iostream>
#include "ARCSlotID.h"
#include "FreeGroup.h"
#include "OID.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/include/FEData.h
+++ magnus-20060324/back_end/SessionManager/include/FEData.h
@@ -15,7 +15,7 @@
#define _FEDATA_H_
-#include <iostream.h>
+#include <iostream>
#include "Chars.h"
#include "OID.h"
#include "ARCSlotID.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/include/ARCer.h
+++ magnus-20060324/back_end/SessionManager/include/ARCer.h
@@ -19,12 +19,14 @@
#include <stdio.h>
#include <signal.h>
#include <unistd.h>
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
#include <sys/wait.h>
#include "MagnusHome.h"
#include "ComputationManager.h"
+using std::ifstream;
+
// ----------------------------- ARCer ------------------------------------- //
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/include/OutMessages.h
+++ magnus-20060324/back_end/SessionManager/include/OutMessages.h
@@ -20,7 +20,7 @@
#define _OUTMESSAGES_H_
#include <stdio.h>
-#include <iostream.h>
+#include <iostream>
#include "Chars.h"
#include "List.h"
#include "ARC.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/include/SessionManager.h
+++ magnus-20060324/back_end/SessionManager/include/SessionManager.h
@@ -14,7 +14,7 @@
#ifndef _SESSIONMANAGER_H_
#define _SESSIONMANAGER_H_
-#include <iostream.h>
+#include <iostream>
#include "ObjectSmith.h"
#include "OutMessages.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/include/OID.h
+++ magnus-20060324/back_end/SessionManager/include/OID.h
@@ -14,7 +14,7 @@
#define _OID_H_
-#include <iostream.h>
+#include <iostream>
#include "IPC.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/include/ARC.h
+++ magnus-20060324/back_end/SessionManager/include/ARC.h
@@ -14,7 +14,9 @@
#define _ARC_H_
-#include <iostream.h>
+#include <iostream>
+
+using std::ostream;
//---------------------------------------------------------------------------//
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/include/ARCSlotID.h
+++ magnus-20060324/back_end/SessionManager/include/ARCSlotID.h
@@ -14,7 +14,7 @@
#define _ARCSLOTID_H_
-#include <iostream.h>
+#include <iostream>
//---------------------------------------------------------------------------//
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/test/magnus.C
+++ magnus-20060324/back_end/SessionManager/test/magnus.C
@@ -23,7 +23,7 @@
#else
# include <sys/filio.h>
#endif
-#include <iostream.h>
+#include <iostream>
#include <errno.h>
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/src/ARCer.C
+++ magnus-20060324/back_end/SessionManager/src/ARCer.C
@@ -15,6 +15,9 @@
#include "ARCer.h"
+using std::ios;
+using std::ofstream;
+
#define DELETE_IPC_FILES
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/src/FEData.C
+++ magnus-20060324/back_end/SessionManager/src/FEData.C
@@ -14,6 +14,8 @@
#include "FEData.h"
#include "SMObject.h"
+using std::ends;
+
//---------------------------------------------------------------------------//
//-------------------------- FEData::(Reps) ---------------------------------//
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/src/ObjectFactory.C
+++ magnus-20060324/back_end/SessionManager/src/ObjectFactory.C
@@ -10,7 +10,7 @@
// Revision History:
//
-#include <iostream.h>
+#include <iostream>
#include "SMFPGroup.h"
#include "ObjectFactory.h"
//#include "FreeGroup.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SessionManager/src/Property.C
+++ magnus-20060324/back_end/SessionManager/src/Property.C
@@ -16,6 +16,10 @@
#include "Property.h"
+using std::ifstream;
+using std::ofstream;
+
+
//@njz: removed
//int SetData< QuickAssociation<PropertyType, Chars> >::hashElement(
// const QuickAssociation<PropertyType, Chars>& t) const;
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Genetic/src/GAIsPartOfBasis.C
+++ magnus-20060324/back_end/Genetic/src/GAIsPartOfBasis.C
@@ -22,6 +22,9 @@
#include "File.h"
#include "conversions.h"
+using std::ofstream;
+
+
// --------------------------- GAIsPartOfBasis ---------------------------- //
GAIsPartOfBasis::GAIsPartOfBasis( const FreeGroup& G, const ACConfig& config,
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Genetic/src/GAEquationSolver.C
+++ magnus-20060324/back_end/Genetic/src/GAEquationSolver.C
@@ -21,6 +21,8 @@
#include "Roulette.h"
#include "File.h"
+using std::ofstream;
+
// -------------------------- GAEquationSolver ----------------------------- //
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Packages/include/PackagesData.h
+++ magnus-20060324/back_end/Packages/include/PackagesData.h
@@ -1,4 +1,4 @@
-#include <fstream.h>
+#include <fstream>
#include "Chars.h"
#include "Menu.h"
#include "SMFPGroup.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Packages/include/PackagesObject.h
+++ magnus-20060324/back_end/Packages/include/PackagesObject.h
@@ -1,4 +1,4 @@
-#include <fstream.h>
+#include <fstream>
#include "Chars.h"
#include "Menu.h"
#include "FEData.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Packages/include/PackagesSMApps.h
+++ magnus-20060324/back_end/Packages/include/PackagesSMApps.h
@@ -7,6 +7,8 @@
#ifndef _SMAppsPackages_h_
#define _SMAppsPackages_h_
+using std::streampos;
+
// ------------------------- PackageBlackBox --------------//
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/global/IPC.h
+++ magnus-20060324/back_end/global/IPC.h
@@ -16,6 +16,9 @@
#ifndef _IPC_H_
#define _IPC_H_
+using std::istream;
+using std::ostream;
+
// ------------------------- Output operators ------------------------------ //
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/global/global.h
+++ magnus-20060324/back_end/global/global.h
@@ -21,9 +21,8 @@
#define _GLOBAL_H_
-#include <stream.h>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
//@njz
//#include <strstream.h>
#include <sstream>
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/global/error.h
+++ magnus-20060324/back_end/global/error.h
@@ -10,6 +10,12 @@
#ifndef _ERROR_H_
#define _ERROR_H_
+using std::cerr;
+using std::cout;
+using std::endl;
+using std::flush;
+
+
#ifdef __GNUG__
//@jml This tells g++ that error does not return.
inline volatile void error(const char *msg) {
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/global/Trichotomy.h
+++ magnus-20060324/back_end/global/Trichotomy.h
@@ -23,6 +23,8 @@
#define ALLOW_BOGUS_CONVERSIONS
+using std::ostream;
+
//------------------------------------------------------------------------//
//----------------------------- Trichotomy -------------------------------//
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/global/ObjectOf.h
+++ magnus-20060324/back_end/global/ObjectOf.h
@@ -56,7 +56,7 @@
#define _OBJECT_OF_H_
-#include <iostream.h>
+#include <iostream>
#include "RefCounter.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Map/include/Map.h
+++ magnus-20060324/back_end/Map/include/Map.h
@@ -52,7 +52,7 @@
#ifndef _MAP_H_
#define _MAP_H_
-#include <iostream.h>
+#include <iostream>
#include "GenericObject.h"
#include "DerivedObjectOf.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Group/include/AbelianEquations.h
+++ magnus-20060324/back_end/Group/include/AbelianEquations.h
@@ -23,7 +23,7 @@
#include "File.h"
#include "Vector.h"
#include "Word.h"
-#include <iostream.h>
+#include <iostream>
class AbelianEquationsSolver {
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Group/test/debug-EquationParser.C
+++ magnus-20060324/back_end/Group/test/debug-EquationParser.C
@@ -1,4 +1,4 @@
-#include <iostream.h>
+#include <iostream>
#include "EquationParser.h"
#include "FreeGroup.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Group/test/debug-MSCGConjugacyProblem.C
+++ magnus-20060324/back_end/Group/test/debug-MSCGConjugacyProblem.C
@@ -10,7 +10,7 @@
// Revision History:
//
-#include "iostream.h"
+#include <iostream>
#include "MSCGConjugacyProblem.h"
#include "NormalRandomWord.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Group/test/debug-AbelianGroup.C
+++ magnus-20060324/back_end/Group/test/debug-AbelianGroup.C
@@ -1,4 +1,4 @@
-#include <iostream.h>
+#include <iostream>
#include <Integer.h>
#include "Map.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Group/test/debug-RandomPrimitiveElement.C
+++ magnus-20060324/back_end/Group/test/debug-RandomPrimitiveElement.C
@@ -1,4 +1,4 @@
-#include <iostream.h>
+#include <iostream>
#include "RandomPrimitiveElement.h"
#include "FreeGroup.h"
#include "WhiteheadAutomorphisms.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Group/test/debug-TietzeTrekker.C
+++ magnus-20060324/back_end/Group/test/debug-TietzeTrekker.C
@@ -1,6 +1,6 @@
// Principal Author: Roger Needham
-#include <iostream.h>
+#include <iostream>
#include "TietzeTrekker.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Group/test/debug-RandomAutomorphism.C
+++ magnus-20060324/back_end/Group/test/debug-RandomAutomorphism.C
@@ -1,4 +1,4 @@
-#include <iostream.h>
+#include <iostream>
#include "RandomAutomorphism.h"
#include "FreeGroup.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Group/src/Homology.C
+++ magnus-20060324/back_end/Group/src/Homology.C
@@ -14,6 +14,9 @@
#include "Homology.h"
#include "MagnusHome.h"
+using std::ends;
+using std::ws;
+
// #define debug_Homology
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Group/src/AbelianEquations.C
+++ magnus-20060324/back_end/Group/src/AbelianEquations.C
@@ -15,7 +15,7 @@
#include "AbelianEquations.h"
-#include <iostream.h>
+#include <iostream>
AbelianEquationsSolver::AbelianEquationsSolver( const AbelianGroup& a ,
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Group/src/ORWordProblem.C
+++ magnus-20060324/back_end/Group/src/ORWordProblem.C
@@ -14,6 +14,8 @@
#include "ORWordProblem.h"
#include "MagnusHome.h"
+using std::ends;
+
ORWordProblem::ORWordProblem(const Word& relator) :
theRelator(relator),
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SMApps/src/WordProblem.C
+++ magnus-20060324/back_end/SMApps/src/WordProblem.C
@@ -24,6 +24,8 @@
#include "GeneticProblems.h"
#include "FNWP.h"
+using std::ends;
+
// ------------------------ ORWordProblemARCer ----------------------------- //
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SMApps/src/IsTrivialProblem.C
+++ magnus-20060324/back_end/SMApps/src/IsTrivialProblem.C
@@ -19,6 +19,9 @@
#include "ORProblems.h"
#include "DecomposeInSubgroup.h"
+using std::ends;
+
+
// ------------------------ IsTrivialChecker ------------------------------- //
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/SMApps/src/QuadEquationSolver.C
+++ magnus-20060324/back_end/SMApps/src/QuadEquationSolver.C
@@ -17,6 +17,8 @@
#include "QEqnSolutions.h"
#include "SolutionsEnum.h"
+using std::ends;
+
// ---------------------- EquationBasicSolutions ------------------------- //
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/NilpotentGroup/include/LCSQuotients.h
+++ magnus-20060324/back_end/NilpotentGroup/include/LCSQuotients.h
@@ -24,7 +24,7 @@
#include "PolyWord.h"
#include "AbelianGroup.h"
#include "MalcevSet.h"
-//#include <iostream.h>
+//#include <iostream>
//========================================================================
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/NilpotentGroup/include/Presentation.h
+++ magnus-20060324/back_end/NilpotentGroup/include/Presentation.h
@@ -32,7 +32,7 @@
#define _PRESENTATION_H_
#include "MalcevSet.h"
-#include <iostream.h>
+#include <iostream>
//=======================================================================
//====================== NilpotentRelator ===============================
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/AProducts/include/AmalgamatedProductParser.h
+++ magnus-20060324/back_end/AProducts/include/AmalgamatedProductParser.h
@@ -58,7 +58,7 @@
Chars& errMesg, int axRelators);
void parseFactorsAndRelations(FreeGroup& f1, FreeGroup& f2,
- VectorOf<Word>& gens1, VectorOf<Word>& gens1,
+ VectorOf<Word>&, VectorOf<Word>&,
int maxRelators, Chars& errMesg);
AmalgProductOfFreeGroupsRep* parseAPofFreeGroups( Chars& errMesg );
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/AProducts/include/SuperGen.h
+++ magnus-20060324/back_end/AProducts/include/SuperGen.h
@@ -17,7 +17,7 @@
#ifndef __SUPERGEN_H__
#define __SUPERGEN_H__
-#include <iostream.h>
+#include <iostream>
#include "global.h"
#include "Generator.h"
//#include "Vector.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/AProducts/include/Range.h
+++ magnus-20060324/back_end/AProducts/include/Range.h
@@ -17,7 +17,11 @@
#ifndef __RANGE_H__
#define __RANGE_H__
-#include <iostream.h>
+#include <iostream>
+
+using std::istream;
+using std::ostream;
+
struct Range {
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/AProducts/include/AP-fixups.h
+++ magnus-20060324/back_end/AProducts/include/AP-fixups.h
@@ -31,6 +31,9 @@
#include "Associations.h"
#include "File.h"
+using std::ends;
+
+
struct RelatorConjugate
{
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/AProducts/src/CONDITION.C
+++ magnus-20060324/back_end/AProducts/src/CONDITION.C
@@ -1,6 +1,11 @@
-#include <iostream.h>
+#include <iostream>
+#include <stdlib.h>
#include "CONDITION.h"
+using std::cerr;
+using std::endl;
+
+
void debugMessage( int msgType, bool condition, const char *condDescription,
const char *fileName, int lineno )
{
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/GAP/src/PermutationParser.C
+++ magnus-20060324/back_end/GAP/src/PermutationParser.C
@@ -24,6 +24,8 @@
#include "conversions.h"
#include "PermutationParser.h"
+using std::ends;
+
//--------------------------- PermutationParser -----------------------------//
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/experiments/test/HNConjecture.C
+++ magnus-20060324/back_end/experiments/test/HNConjecture.C
@@ -15,7 +15,7 @@
// Next implementation steps:
-#include <iostream.h>
+#include <iostream>
#include "SubgroupGraph.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/Equations/include/VectorPtr.h
+++ magnus-20060324/back_end/Equations/include/VectorPtr.h
@@ -77,7 +77,7 @@
#define _VECTOR_PTR_H_
-#include <iostream.h>
+#include <iostream>
#include "RefCounter.h"
#include "ObjectOf.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/FSA/include/FSARep.h
+++ magnus-20060324/back_end/FSA/include/FSARep.h
@@ -20,6 +20,8 @@
#include "RefCounter.h"
#include "Word.h"
+using std::cin;
+
class FSARep : public RefCounter {
public:
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/FSA/include/DFSAParser.h
+++ magnus-20060324/back_end/FSA/include/DFSAParser.h
@@ -13,8 +13,8 @@
#ifndef _DFSA_PARSER_H_
#define _DFSA_PARSER_H_
-#include <iostream.h>
-#include <iomanip.h>
+#include <iostream>
+#include <iomanip>
//#include <stdiostream.h>
#include "global.h"
#include "DFSARep.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/FSA/src/DFSAParser.C
+++ magnus-20060324/back_end/FSA/src/DFSAParser.C
@@ -12,7 +12,7 @@
// * 8/96 Dmitry B. made porting to gcc 2.7.2.
//
-#include <iostream.h>
+#include <iostream>
#include <string.h>
#include "DFSAParser.h"
#include "Chars.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/libg++/include/String1.h
+++ magnus-20060324/back_end/libg++/include/String1.h
@@ -23,9 +23,13 @@
#endif
#define _String_h 1
-#include <iostream.h>
+#include <iostream>
//#include <Regex.h>
+using std::istream;
+using std::ostream;
+
+
#undef OK
struct StrRep // internal String representations
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/libg++/src/Integer.C
+++ magnus-20060324/back_end/libg++/src/Integer.C
@@ -34,10 +34,15 @@
#include <limits.h>
//#include <Obstack.h>
#include <AllocRing.h>
-#include <new.h>
+#include <new>
#include <builtin.h>
#include "Integer.hP"
+using std::ios;
+using std::istream;
+using std::streambuf;
+
+
#undef OK
IntRep _ZeroRep = {1, 0, 1, {0}};
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/libg++/src/String1.C
+++ magnus-20060324/back_end/libg++/src/String1.C
@@ -26,11 +26,15 @@
#include "std.h"
#include <ctype.h>
#include <limits.h>
-#include <new.h>
+#include <new>
#include "builtin.h"
#undef OK
+using std::ios;
+using std::streambuf;
+
+
void String::error(const char* msg) const
{
(*lib_error_handler)("String", msg);
only in patch2:
unchanged:
--- magnus-20060324.orig/back_end/libg++/src/AllocRing.C
+++ magnus-20060324/back_end/libg++/src/AllocRing.C
@@ -21,7 +21,7 @@
#endif
#include <std.h>
#include <AllocRing.h>
-#include <new.h>
+#include <new>
AllocRing::AllocRing(int max)
:n(max), current(0), nodes(new AllocQNode[max])
only in patch2:
unchanged:
--- magnus-20060324.orig/experiments/src/H.Neumann_conjecture.C
+++ magnus-20060324/experiments/src/H.Neumann_conjecture.C
@@ -15,7 +15,7 @@
// Next implementation steps:
-#include <iostream.h>
+#include <iostream>
#include "SubgroupGraph.h"
only in patch2:
unchanged:
--- magnus-20060324.orig/experiments/src/H.Neumann_conjecture2.C
+++ magnus-20060324/experiments/src/H.Neumann_conjecture2.C
@@ -15,7 +15,7 @@
// Next implementation steps:
-#include <iostream.h>
+#include <iostream>
#include "SubgroupGraph.h"
signature.asc
Description: Digital signature
