Attachment #159667 for bug #230898

View | Details | Raw Unified | Return to bug 230898
Collapse All | Expand All

Lines 25-32 Link Here

(-)yaccsrc/polyx.h.orig (-2 / +2 lines)
25		25
26	#ifndef POLYX_H	26	#ifndef POLYX_H
27	#define POLYX_H	27	#define POLYX_H
28		28	using namespace std;
29	#include <iostream.h>	29	#include <iostream>
30		30
31	/*****************************************************************************/	31	/*****************************************************************************/
32	/* POLYNIMIALS IN X */	32	/* POLYNIMIALS IN X */

Lines 32-39 Link Here

(-)yaccsrc/mymemory.cc.orig (-2 / +3 lines)
32	/* Date: 14.8.94 */	32	/* Date: 14.8.94 */
33	/* ------------------------------------------------------------------------- */	33	/* ------------------------------------------------------------------------- */
34		34
35	#include <iostream.h>	35	using namespace std;
36	#include <stdlib.h>	36	#include <iostream>
		37	#include <cstdlib>
37		38
38	#include "mymemory.h"	39	#include "mymemory.h"
39		40

Lines 23-32 Link Here

(-)yaccsrc/SymbolTable.cc.orig (-3 / +3 lines)
23	*/	23	*/
24		24
25		25
26	#include <iostream.h>	26
27	#include <iostream.h>	27	#include <iostream>
28	#include <assert.h>	28	#include <assert.h>
29	#include <stdlib.h>	29	#include <cstdlib>
30		30
31	#include <string.h>	31	#include <string.h>
32	#include "SymbolTable.h"	32	#include "SymbolTable.h"

Lines 26-35 Link Here

(-)yaccsrc/SymbolTable.h.orig (-3 / +4 lines)
26	#ifndef SYMBOLTABLE_H	26	#ifndef SYMBOLTABLE_H
27	#define SYMBOLTABLE_H	27	#define SYMBOLTABLE_H
28		28
29	#include <stdlib.h>	29	#include <cstdlib>
30		30
31	#include <iostream.h>	31	using namespace std;
32	#include <stdio.h>	32	#include <iostream>
		33	#include <cstdio>
33		34
34	class SymbolTable	35	class SymbolTable
35	{	36	{

Lines 27-33 Link Here

(-)yaccsrc/Script.cc.orig (-1 / +1 lines)
27	#include <stdio.h>	27	#include <stdio.h>
28	#include <errno.h>	28	#include <errno.h>
29		29
30	#include <iostream.h>	30	#include <iostream>
31		31
32	#include <sys/stat.h>	32	#include <sys/stat.h>
33	#include <unistd.h>	33	#include <unistd.h>

Lines 26-32 Link Here

(-)curve/TreePolynom.h.orig (-1 / +3 lines)
26	#ifndef TREEPOLYNOM_H	26	#ifndef TREEPOLYNOM_H
27	#define TREEPOLYNOM_H	27	#define TREEPOLYNOM_H
28		28
29	#include <iostream.h>	29	using namespace std;
		30	#include <iostream>
		31
30		32
31	#include "defs.h"	33	#include "defs.h"
32	#include "debug.h"	34	#include "debug.h"

Lines 26-32 Link Here

(-)debug/debug.h.orig (-1 / +2 lines)
26	#ifndef DEBUG_H	26	#ifndef DEBUG_H
27	#define DEBUG_H	27	#define DEBUG_H
28		28
29	#include <iostream.h>	29	using namespace std;
		30	#include <iostream>
30		31
31	class FunctionCall	32	class FunctionCall
32	{	33	{

Lines 26-33 Link Here

(-)curve/RBTree.h.orig (-1 / +2 lines)
26	#ifndef RBTREE_H	26	#ifndef RBTREE_H
27	#define RBTREE_H	27	#define RBTREE_H
28		28
		29
29	#include <assert.h>	30	#include <assert.h>
30	#include <iostream.h>	31	#include <iostream>
31		32
32	#include "debug.h"	33	#include "debug.h"
33		34

Lines 28-34 Link Here

(-)drawfunc/MultiVariatePolynom.h.orig (-1 / +2 lines)
28	#ifndef CLMULTIPOLY_H	28	#ifndef CLMULTIPOLY_H
29	#define CLMULTIPOLY_H	29	#define CLMULTIPOLY_H
30		30
31	#include <iostream.h>	31
		32	#include <iostream>
32		33
33	#define VARIABLE_X 0	34	#define VARIABLE_X 0
34	#define VARIABLE_Y 1	35	#define VARIABLE_Y 1

Lines 28-35 Link Here

(-)drawfunc/Monomial.h.orig (-2 / +3 lines)
28	#ifndef CLMONOM_H	28	#ifndef CLMONOM_H
29	#define CLMONOM_H	29	#define CLMONOM_H
30		30
31	#include <math.h>	31	using namespace std;
32	#include <iostream.h>	32	#include <cmath>
		33	#include <iostream>
33		34
34	#include "simple.h"	35	#include "simple.h"
35	#include "monomarith.h"	36	#include "monomarith.h"
36		37
37		38




#ifndef CMonom_H
#define CMonom_H


#include <cstdlib>
#include <cstring>
#include <iostream>

#include "doubleMath.h"


template<class Coeff,  int num> 
inline void negate(CMonom<Coeff,num> &m)
{
	Coeff::negate(m.getCoeff());
}



Lines 23-30 Link Here

(-)src/bit_buffer.cc.orig (-2 / +3 lines)
23	*/	23	*/
24		24
25		25
26	#include <limits.h>	26
27	#include <iostream.h>	27	#include <climits>
		28	#include <iostream>
28		29
29	#include "bit_buffer.h"	30	#include "bit_buffer.h"
30		31

Lines 22-28 Link Here

(-)src/main.cc.orig (-1 / +2 lines)
22	*	22	*
23	*/	23	*/
24		24
25	#include <iostream.h>	25
		26	#include <iostream>
26	#include <string.h>	27	#include <string.h>
27	#include <stdlib.h>	28	#include <stdlib.h>
28	#include <signal.h>	29	#include <signal.h>

Lines 34-42 Link Here

(-)src/RgbBuffer.cc.orig (-3 / +4 lines)
34		34
35		35
36		36
37	#include <math.h>	37
38	#include <stdlib.h>	38	#include <cmath>
39	#include <iostream.h>	39	#include <cstdlib>
		40	#include <iostream>
40	#include <stdio.h>	41	#include <stdio.h>
41	#include <string.h>	42	#include <string.h>
42		43

Lines 24-32 Link Here

(-)drawfunc/DrawFunc.cc.orig (-2 / +3 lines)
24		24
25		25
26		26
		27
27	#include <stdio.h>	28	#include <stdio.h>
28	#include <math.h>	29	#include <cmath>
29	#include <iostream.h>	30	#include <iostream>
30		31
31	#include "Script.h"	32	#include "Script.h"
32		33

Lines 23-29 Link Here

(-)curve/RBTree.cc.orig (-1 / +2 lines)
23	*/	23	*/
24		24
25		25
26	#include <iostream.h>	26
		27	#include <iostream>
27	#include <assert.h>	28	#include <assert.h>
28		29
29	#include "RBTree.h"	30	#include "RBTree.h"

Lines 26-32 Link Here

(-)curve/Bezout.h.orig (-1 / +2 lines)
26	#ifndef Bezout_h	26	#ifndef Bezout_h
27	#define Bezout_h	27	#define Bezout_h
28		28
29	#include <iostream.h>	29
		30	#include <iostream>
30		31
31	#include "TreePolynom.h"	32	#include "TreePolynom.h"
32	#include "Monom.h"	33	#include "Monom.h"

Lines 26-32 Link Here

(-)curve/BigInteger.h.orig (-1 / +2 lines)
26	#ifndef BIGINTEGER_H	26	#ifndef BIGINTEGER_H
27	#define BIGINTEGER_H	27	#define BIGINTEGER_H
28		28
29	#include <iostream.h>	29
		30	#include <iostream>
30		31
31	#include "mygmp.h"	32	#include "mygmp.h"
32		33

Lines 32-38 Link Here

(-)curve/mygmp.h.orig (-1 / +2 lines)
32	#include <gmp.h>	32	#include <gmp.h>
33	#endif	33	#endif
34		34
35	#include <iostream.h>	35
		36	#include <iostream>
36		37
37	extern void mpz_lcm (mpz_t lcm, mpz_t op1, mpz_t op2);	38	extern void mpz_lcm (mpz_t lcm, mpz_t op1, mpz_t op2);
38	extern ostream & operator << (ostream &os, mpz_t z);	39	extern ostream & operator << (ostream &os, mpz_t z);

Lines 26-33 Link Here

(-)debug/Timer.h.orig (-2 / +3 lines)
26	#ifndef TIMER_H	26	#ifndef TIMER_H
27	#define TIMER_H	27	#define TIMER_H
28		28
29	#include <time.h>	29
30	#include <iostream.h>	30	#include <ctime>
		31	#include <iostream>
31		32
32	#define TIMER(s) Timer aTimer(s)	33	#define TIMER(s) Timer aTimer(s)
33	class Timer	34	class Timer

Return to bug 230898

Lines 26-34 Link Here

(-)curve/Monom.h.orig (-4 / +5 lines)
26	#ifndef CMonom_H	26	#ifndef CMonom_H
27	#define CMonom_H	27	#define CMonom_H
28		28
29	#include <stdlib.h>	29
30	#include <string.h>	30	#include <cstdlib>
31	#include <iostream.h>	31	#include <cstring>
		32	#include <iostream>
32		33
33	#include "doubleMath.h"	34	#include "doubleMath.h"
34		35
Lines 122-128 Link Here
122	template<class Coeff, int num>	123	template<class Coeff, int num>
123	inline void negate(CMonom<Coeff,num> &m)	124	inline void negate(CMonom<Coeff,num> &m)
124	{	125	{
125	negate(m.getCoeff());	126	Coeff::negate(m.getCoeff());
126	}	127	}
127		128
128		129