Hi,
Ballista uses some deprecated headers (e.g. iostream.h, fstream.h) which
aren't supported in GCC 4.3 FSF edition and which are removed. So here
is a patch which uses the ISO compliant headers. It furthermore assures
the backward compatibility.
Regards,
--
Patrick Kirsch - Quality Assurance Department
SUSE Linux Products GmbH GF: Markus Rex, HRB 16746 (AG Nuernberg)
diff -pur ltp-full-20071231.orig/testcases/ballista/ballista/ballista.cpp
ltp-full-20071231/testcases/ballista/ballista/ballista.cpp
--- ltp-full-20071231.orig/testcases/ballista/ballista/ballista.cpp
2008-01-01 06:45:00.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/ballista.cpp 2008-01-21
13:02:45.000000000 -0500
@@ -17,10 +17,10 @@
#include <errno.h>
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
-#include <fstream.h>
+#include <fstream>
#include <signal.h>
#include <string.h>
#include <sys/stat.h>
@@ -48,6 +48,8 @@
#include "testCaseIterator.h"
#include "testManager.h"
+using std::ifstream;
+
#ifdef B_VXWORKS
#include "vxworks.h"
#else
diff -pur ltp-full-20071231.orig/testcases/ballista/ballista/ballistaUtil.cpp
ltp-full-20071231/testcases/ballista/ballista/ballistaUtil.cpp
--- ltp-full-20071231.orig/testcases/ballista/ballista/ballistaUtil.cpp
2008-01-01 06:44:58.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/ballistaUtil.cpp
2008-01-22 03:23:31.000000000 -0500
@@ -19,12 +19,15 @@
#include <assert.h>
#include <string.h>
#include <sys/time.h> //for get_time_in_microseconds
-#include <iostream.h>
+#include <iostream>
#include <stdlib.h>
#include "ballistaUtil.h"
#include "ballista.h"
+using std::endl;
+using std::cerr;
+
/************************
*
* Function: safe_strncpy
diff -pur ltp-full-20071231.orig/testcases/ballista/ballista/callGen.cpp
ltp-full-20071231/testcases/ballista/ballista/callGen.cpp
--- ltp-full-20071231.orig/testcases/ballista/ballista/callGen.cpp
2008-01-01 06:44:58.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/callGen.cpp 2008-01-22
03:15:32.000000000 -0500
@@ -17,11 +17,17 @@
#include <stdio.h>
#include <stdlib.h>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <string.h>
#define qt (char)34
+using std::ifstream;
+using std::ofstream;
+using std::ios;
+using std::cout;
+using std::endl;
+using std::cerr;
char *temp=tempnam(NULL,"cg");
diff -pur
ltp-full-20071231.orig/testcases/ballista/ballista/compile/bparser.cpp
ltp-full-20071231/testcases/ballista/ballista/compile/bparser.cpp
--- ltp-full-20071231.orig/testcases/ballista/ballista/compile/bparser.cpp
2008-01-01 06:45:00.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/compile/bparser.cpp
2008-01-21 13:12:20.000000000 -0500
@@ -17,8 +17,8 @@
*/
#include <ctype.h>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
@@ -1064,7 +1064,7 @@ void buildH()
h1<<"#ifndef "<<obNamebak<<"_H"<<endl;
h1<<"#define "<<obNamebak<<"_H"<<endl;
h1<<"#include <errno.h>"<<endl;
- h1<<"#include <iostream.h>"<<endl;
+ h1<<"#include <iostream>"<<endl;
h1<<"#include <stdio.h>"<<endl;
h1<<"#include <stdlib.h>"<<endl;
h1<<"#include <stream.h>"<<endl;
@@ -1216,7 +1216,7 @@ void buildCPP()
cf<<"//--------------------------------------------------------------------"
<<endl<<endl;
cf<<"#include <errno.h>"<<endl;
- cf<<"#include <iostream.h>"<<endl;
+ cf<<"#include <iostream>"<<endl;
cf<<"#include <stdio.h>"<<endl;
cf<<"#include <stdlib.h>"<<endl;
cf<<"#include <stream.h>"<<endl;
diff -pur ltp-full-20071231.orig/testcases/ballista/ballista/create_code.pl
ltp-full-20071231/testcases/ballista/ballista/create_code.pl
--- ltp-full-20071231.orig/testcases/ballista/ballista/create_code.pl
2008-01-01 06:45:00.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/create_code.pl
2008-01-21 13:12:20.000000000 -0500
@@ -175,7 +175,7 @@ print OUTFILE "\n\n";
print OUTFILE '/* This code will work for most operating systems using g++ ';
print OUTFILE 'You may have to add a couple #include lines, especially if ';
print OUTFILE 'you are testing your own function */';
-print OUTFILE "#include <stdio.h>\n#include <stdlib.h>\n#include
<iostream.h>\n";
+print OUTFILE "#include <stdio.h>\n#include <stdlib.h>\n#include <iostream>\n";
#print OUTFILE "#include <unistd.h>\n\n\n";
print OUTFILE '/* Includes from user */';
diff -pur
ltp-full-20071231.orig/testcases/ballista/ballista/create_code_standAlone.pl
ltp-full-20071231/testcases/ballista/ballista/create_code_standAlone.pl
---
ltp-full-20071231.orig/testcases/ballista/ballista/create_code_standAlone.pl
2008-01-01 06:44:58.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/create_code_standAlone.pl
2008-01-21 13:12:20.000000000 -0500
@@ -182,7 +182,7 @@ print OUTFILE "\n\n";
print OUTFILE '/* This code will work for most operating systems using g++ ';
print OUTFILE 'You may have to add a couple #include lines, especially if ';
print OUTFILE 'you are testing your own function */';
-print OUTFILE "#include <stdio.h>\n#include <stdlib.h>\n#include
<iostream.h>\n";
+print OUTFILE "#include <stdio.h>\n#include <stdlib.h>\n#include <iostream>\n";
#print OUTFILE "#include <unistd.h>\n\n\n";
print OUTFILE '/* Includes from user */';
diff -pur
ltp-full-20071231.orig/testcases/ballista/ballista/executeTestCase.cpp
ltp-full-20071231/testcases/ballista/ballista/executeTestCase.cpp
--- ltp-full-20071231.orig/testcases/ballista/ballista/executeTestCase.cpp
2008-01-01 06:44:59.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/executeTestCase.cpp
2008-01-21 13:12:20.000000000 -0500
@@ -17,7 +17,7 @@
#include "executeTestCase.h"
#include <stdio.h>
-#include <iostream.h>
+#include <iostream>
#include <signal.h>
#include "unmarshal.h"
diff -pur
ltp-full-20071231.orig/testcases/ballista/ballista/executeTestCase.fresh
ltp-full-20071231/testcases/ballista/ballista/executeTestCase.fresh
--- ltp-full-20071231.orig/testcases/ballista/ballista/executeTestCase.fresh
2008-01-01 06:45:00.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/executeTestCase.fresh
2008-01-21 13:12:20.000000000 -0500
@@ -17,7 +17,7 @@
#include "executeTestCase.h"
#include <stdio.h>
-#include <iostream.h>
+#include <iostream>
#include <signal.h>
#include "unmarshal.h"
diff -pur ltp-full-20071231.orig/testcases/ballista/ballista/genCode.cpp
ltp-full-20071231/testcases/ballista/ballista/genCode.cpp
--- ltp-full-20071231.orig/testcases/ballista/ballista/genCode.cpp
2008-01-01 06:44:57.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/genCode.cpp 2008-01-21
13:12:20.000000000 -0500
@@ -15,8 +15,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <stdio.h>
#include <stdlib.h>
diff -pur ltp-full-20071231.orig/testcases/ballista/ballista/genCodeCreator.cpp
ltp-full-20071231/testcases/ballista/ballista/genCodeCreator.cpp
--- ltp-full-20071231.orig/testcases/ballista/ballista/genCodeCreator.cpp
2008-01-01 06:44:59.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/genCodeCreator.cpp
2008-01-22 03:21:05.000000000 -0500
@@ -23,13 +23,20 @@
// is useful for bug reports.
//-------------------------------------------------------------------------------------------
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "ballista.h"
+using std::ifstream;
+using std::ofstream;
+using std::ios;
+using std::cout;
+using std::endl;
+using std::cerr;
+
int main(int argc, char *argv[])
{
if (argc < 5)
diff -pur ltp-full-20071231.orig/testcases/ballista/ballista/line.cpp
ltp-full-20071231/testcases/ballista/ballista/line.cpp
--- ltp-full-20071231.orig/testcases/ballista/ballista/line.cpp 2008-01-01
06:44:56.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/line.cpp 2008-01-21
13:12:20.000000000 -0500
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include <iostream.h>
+#include <iostream>
#include <stdlib.h>
#include <stream.h>
#include <string.h>
diff -pur ltp-full-20071231.orig/testcases/ballista/ballista/line.h
ltp-full-20071231/testcases/ballista/ballista/line.h
--- ltp-full-20071231.orig/testcases/ballista/ballista/line.h 2008-01-01
06:45:00.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/line.h 2008-01-21
13:12:20.000000000 -0500
@@ -18,7 +18,7 @@
#ifndef _LINE_H_
#define _LINE_H_
-#include <iostream.h>
+#include <iostream>
#include <stream.h>
class line
diff -pur ltp-full-20071231.orig/testcases/ballista/ballista/parseArguments.cpp
ltp-full-20071231/testcases/ballista/ballista/parseArguments.cpp
--- ltp-full-20071231.orig/testcases/ballista/ballista/parseArguments.cpp
2008-01-01 06:44:58.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/parseArguments.cpp
2008-01-22 03:23:56.000000000 -0500
@@ -17,12 +17,16 @@
*/
#include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
#include <ctype.h>
#include <assert.h>
#include "parseArguments.h"
#include "ballistaUtil.h"
+using std::endl;
+using std::cerr;
+
+
/************************
*
* Function: Parse_arguments
diff -pur ltp-full-20071231.orig/testcases/ballista/ballista/replacer.cpp
ltp-full-20071231/testcases/ballista/ballista/replacer.cpp
--- ltp-full-20071231.orig/testcases/ballista/ballista/replacer.cpp
2008-01-01 06:45:00.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/replacer.cpp 2008-01-22
03:21:45.000000000 -0500
@@ -15,12 +15,20 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+using std::ifstream;
+using std::ofstream;
+using std::ios;
+using std::cout;
+using std::endl;
+using std::cerr;
+using std::cin;
+
// From: John Peter DeVale <[EMAIL PROTECTED]>
// To: [EMAIL PROTECTED]
// Message-ID: <[EMAIL PROTECTED]>
diff -pur ltp-full-20071231.orig/testcases/ballista/ballista/selfHost.cpp
ltp-full-20071231/testcases/ballista/ballista/selfHost.cpp
--- ltp-full-20071231.orig/testcases/ballista/ballista/selfHost.cpp
2008-01-01 06:44:57.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/selfHost.cpp 2008-01-22
03:22:47.000000000 -0500
@@ -18,7 +18,7 @@
#include <assert.h> //for asserts in manage_test
#include <dlfcn.h> //for dynamic loading in constructor
-#include <iostream.h> //for cout and cerr
+#include <iostream> //for cout and cerr
#include <signal.h> //for SIGKILL
#include <stdio.h> //generally needed
#include <stdlib.h> //generally needed
@@ -37,6 +37,11 @@
extern "C" int execute_test_case (char *marshalled_parameters);
+using std::cin;
+using std::cout;
+using std::cerr;
+using std::endl;
+
#ifdef SUN
//Our Sun's at CMU seem to be missing the usleep proto
//from unistd.h
diff -pur
ltp-full-20071231.orig/testcases/ballista/ballista/templates/bTypes.cpp
ltp-full-20071231/testcases/ballista/ballista/templates/bTypes.cpp
--- ltp-full-20071231.orig/testcases/ballista/ballista/templates/bTypes.cpp
2008-01-01 06:44:58.000000000 -0500
+++ ltp-full-20071231/testcases/ballista/ballista/templates/bTypes.cpp
2008-01-21 13:12:20.000000000 -0500
@@ -43,7 +43,7 @@ IMPLEMENTATION DESIGN
#include <stdio.h>
#include <stdlib.h>
#include <stream.h>
-#include <iostream.h>
+#include <iostream>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
