surf-ag/gcc44-patch

   1 diff -aur surf-1.0.5.orig/curve/Bezout.h surf-1.0.5/curve/Bezout.h
   2 --- surf-1.0.5.orig/curve/Bezout.h      2006-03-04 22:11:56.000000000 +0100
   3 +++ surf-1.0.5/curve/Bezout.h   2009-06-17 21:01:33.000000000 +0200
   4 @@ -26,7 +26,9 @@
   5  #ifndef Bezout_h
   6  #define Bezout_h
   7
   8 -#include <iostream.h>
   9 +#include <iostream>
  10 +
  11 +using namespace std;
  12
  13  #include "TreePolynom.h"
  14  #include "Monom.h"
  15 diff -aur surf-1.0.5.orig/curve/BigInteger.h surf-1.0.5/curve/BigInteger.h
  16 --- surf-1.0.5.orig/curve/BigInteger.h  2006-03-04 22:11:56.000000000 +0100
  17 +++ surf-1.0.5/curve/BigInteger.h       2009-06-17 21:01:33.000000000 +0200
  18 @@ -26,7 +26,9 @@
  19  #ifndef BIGINTEGER_H
  20  #define BIGINTEGER_H
  21
  22 -#include <iostream.h>
  23 +#include <iostream>
  24 +
  25 +using namespace std;
  26
  27  #include "mygmp.h"
  28
  29 @@ -56,7 +58,7 @@
  30                         return mpz_get_d (mpz);
  31                 }
  32         friend inline bool isNull (const BigInteger &b);
  33 -       friend inline void negate (BigInteger &b);
  34 +       friend inline void negatenum (BigInteger &b);
  35
  36  private:
  37         mpz_t mpz;
  38 @@ -73,7 +75,7 @@
  39         return mpz_sgn(b.mpz)==0;
  40  }
  41
  42 -inline void negate (BigInteger &b)
  43 +inline void negatenum (BigInteger &b)
  44  {
  45         mpz_neg(b.mpz, b.mpz);
  46  }
  47 diff -aur surf-1.0.5.orig/curve/Monom.h surf-1.0.5/curve/Monom.h
  48 --- surf-1.0.5.orig/curve/Monom.h       2006-03-04 22:11:56.000000000 +0100
  49 +++ surf-1.0.5/curve/Monom.h    2009-06-17 21:01:33.000000000 +0200
  50 @@ -28,7 +28,7 @@
  51
  52  #include <stdlib.h>
  53  #include <string.h>
  54 -#include <iostream.h>
  55 +#include <iostream>
  56
  57  #include "doubleMath.h"
  58
  59 @@ -120,9 +120,9 @@
  60  // }
  61
  62  template<class Coeff,  int num>
  63 -inline void negate(CMonom<Coeff,num> &m)
  64 +inline void negateMonom(CMonom<Coeff,num> &m)
  65  {
  66 -       negate(m.getCoeff());
  67 +       negatenum(m.getCoeff());
  68  }
  69
  70
  71 diff -aur surf-1.0.5.orig/curve/RBTree.cc surf-1.0.5/curve/RBTree.cc
  72 --- surf-1.0.5.orig/curve/RBTree.cc     2006-03-04 22:48:27.000000000 +0100
  73 +++ surf-1.0.5/curve/RBTree.cc  2009-06-17 21:01:33.000000000 +0200
  74 @@ -23,9 +23,11 @@
  75   */
  76
  77
  78 -#include <iostream.h>
  79 +#include <iostream>
  80  #include <assert.h>
  81
  82 +using namespace std;
  83 +
  84  #include "RBTree.h"
  85
  86
  87 diff -aur surf-1.0.5.orig/curve/RBTree.h surf-1.0.5/curve/RBTree.h
  88 --- surf-1.0.5.orig/curve/RBTree.h      2006-03-04 22:11:56.000000000 +0100
  89 +++ surf-1.0.5/curve/RBTree.h   2009-06-17 21:01:33.000000000 +0200
  90 @@ -27,7 +27,9 @@
  91  #define RBTREE_H
  92
  93  #include <assert.h>
  94 -#include <iostream.h>
  95 +#include <iostream>
  96 +
  97 +using namespace std;
  98
  99  #include "debug.h"
 100
 101 diff -aur surf-1.0.5.orig/curve/RootFinder2d.cc surf-1.0.5/curve/RootFinder2d.cc
 102 --- surf-1.0.5.orig/curve/RootFinder2d.cc       2006-03-04 22:48:27.000000000 +0100
 103 +++ surf-1.0.5/curve/RootFinder2d.cc    2009-06-17 21:01:33.000000000 +0200
 104 @@ -24,7 +24,6 @@
 105
 106
 107  #include <assert.h>
 108 -#include <iostream.h>
 109
 110  #include "RootFinder2d.h"
 111  #include "degree.h"
 112 diff -aur surf-1.0.5.orig/curve/RootFinder3d.cc surf-1.0.5/curve/RootFinder3d.cc
 113 --- surf-1.0.5.orig/curve/RootFinder3d.cc       2006-03-04 22:48:27.000000000 +0100
 114 +++ surf-1.0.5/curve/RootFinder3d.cc    2009-06-17 21:01:33.000000000 +0200
 115 @@ -24,7 +24,6 @@
 116
 117
 118  #include <assert.h>
 119 -#include <iostream.h>
 120  #include <math.h>
 121
 122  #include "degree.h"
 123 diff -aur surf-1.0.5.orig/curve/TreePolynom.h surf-1.0.5/curve/TreePolynom.h
 124 --- surf-1.0.5.orig/curve/TreePolynom.h 2006-03-04 22:11:56.000000000 +0100
 125 +++ surf-1.0.5/curve/TreePolynom.h      2009-06-17 21:01:33.000000000 +0200
 126 @@ -26,7 +26,7 @@
 127  #ifndef TREEPOLYNOM_H
 128  #define TREEPOLYNOM_H
 129
 130 -#include <iostream.h>
 131 +#include <iostream>
 132
 133  #include "defs.h"
 134  #include "debug.h"
 135 @@ -200,7 +200,7 @@
 136
 137         TreePolynomNode<Monom> *x = new TreePolynomNode<Monom>();
 138         x->monom = mon;
 139 -       negate(x->monom);
 140 +       negateMonom(x->monom);
 141         if (parent) {
 142                 // cmp might not be used uninitialized, because if parent != 0 we made a
 143                 // call to cmp = lexorder(mon, current->monom) (see above)
 144 diff -aur surf-1.0.5.orig/curve/doubleMath.h surf-1.0.5/curve/doubleMath.h
 145 --- surf-1.0.5.orig/curve/doubleMath.h  2006-03-04 22:11:56.000000000 +0100
 146 +++ surf-1.0.5/curve/doubleMath.h       2009-06-17 21:01:33.000000000 +0200
 147 @@ -31,7 +31,7 @@
 148         return d==0.0;
 149  }
 150
 151 -inline void negate (double &d)
 152 +inline void negatenum (double &d)
 153  {
 154         d=-d;
 155  }
 156 diff -aur surf-1.0.5.orig/curve/mygmp.h surf-1.0.5/curve/mygmp.h
 157 --- surf-1.0.5.orig/curve/mygmp.h       2006-03-04 22:11:56.000000000 +0100
 158 +++ surf-1.0.5/curve/mygmp.h    2009-06-17 21:01:33.000000000 +0200
 159 @@ -32,7 +32,9 @@
 160  #include <gmp.h>
 161  #endif
 162
 163 -#include <iostream.h>
 164 +#include <iostream>
 165 +
 166 +using namespace std;
 167
 168  extern void mpz_lcm (mpz_t lcm, mpz_t op1, mpz_t op2);
 169  extern ostream & operator << (ostream &os, mpz_t z);
 170 diff -aur surf-1.0.5.orig/debug/Timer.h surf-1.0.5/debug/Timer.h
 171 --- surf-1.0.5.orig/debug/Timer.h       2006-03-04 22:11:56.000000000 +0100
 172 +++ surf-1.0.5/debug/Timer.h    2009-06-17 21:01:33.000000000 +0200
 173 @@ -27,7 +27,9 @@
 174  #define TIMER_H
 175
 176  #include <time.h>
 177 -#include <iostream.h>
 178 +#include <iostream>
 179 +
 180 +using namespace std;
 181
 182  #define TIMER(s) Timer aTimer(s)
 183  class Timer
 184 diff -aur surf-1.0.5.orig/debug/debug.cc surf-1.0.5/debug/debug.cc
 185 --- surf-1.0.5.orig/debug/debug.cc      2006-03-04 22:48:27.000000000 +0100
 186 +++ surf-1.0.5/debug/debug.cc   2009-06-17 21:01:33.000000000 +0200
 187 @@ -23,9 +23,11 @@
 188   */
 189
 190
 191 -#include <iostream.h>
 192 +#include <iostream>
 193  #include <string.h>
 194
 195 +using namespace std;
 196 +
 197  #include "debug.h"
 198
 199  static int level=0;
 200 diff -aur surf-1.0.5.orig/debug/debug.h surf-1.0.5/debug/debug.h
 201 --- surf-1.0.5.orig/debug/debug.h       2006-03-04 22:11:56.000000000 +0100
 202 +++ surf-1.0.5/debug/debug.h    2009-06-17 21:01:33.000000000 +0200
 203 @@ -26,7 +26,9 @@
 204  #ifndef DEBUG_H
 205  #define DEBUG_H
 206
 207 -#include <iostream.h>
 208 +#include <iostream>
 209 +
 210 +using namespace std;
 211
 212  class FunctionCall
 213  {
 214 diff -aur surf-1.0.5.orig/draw/NewClip.cc surf-1.0.5/draw/NewClip.cc
 215 --- surf-1.0.5.orig/draw/NewClip.cc     2006-03-04 22:48:27.000000000 +0100
 216 +++ surf-1.0.5/draw/NewClip.cc  2009-06-17 21:01:33.000000000 +0200
 217 @@ -23,7 +23,7 @@
 218   */
 219
 220
 221 -#include <iostream.h>
 222 +#include <iostream>
 223
 224  #include "NewClip.h"
 225  #include "NewClipSphereParallel.h"
 226 diff -aur surf-1.0.5.orig/drawfunc/DrawFunc.cc surf-1.0.5/drawfunc/DrawFunc.cc
 227 --- surf-1.0.5.orig/drawfunc/DrawFunc.cc        2006-03-04 22:48:28.000000000 +0100
 228 +++ surf-1.0.5/drawfunc/DrawFunc.cc     2009-06-17 21:01:33.000000000 +0200
 229 @@ -26,7 +26,9 @@
 230
 231  #include <stdio.h>
 232  #include <math.h>
 233 -#include <iostream.h>
 234 +#include <iostream>
 235 +
 236 +using namespace std;
 237
 238  #include "Script.h"
 239
 240 diff -aur surf-1.0.5.orig/drawfunc/Monomial.h surf-1.0.5/drawfunc/Monomial.h
 241 --- surf-1.0.5.orig/drawfunc/Monomial.h 2006-03-04 22:11:58.000000000 +0100
 242 +++ surf-1.0.5/drawfunc/Monomial.h      2009-06-17 21:01:33.000000000 +0200
 243 @@ -29,7 +29,9 @@
 244  #define CLMONOM_H
 245
 246  #include <math.h>
 247 -#include <iostream.h>
 248 +#include <iostream>
 249 +
 250 +using namespace std;
 251
 252  #include "simple.h"
 253  #include "monomarith.h"
 254 diff -aur surf-1.0.5.orig/drawfunc/MultiVariatePolynom.h surf-1.0.5/drawfunc/MultiVariatePolynom.h
 255 --- surf-1.0.5.orig/drawfunc/MultiVariatePolynom.h      2006-03-04 22:11:58.000000000 +0100
 256 +++ surf-1.0.5/drawfunc/MultiVariatePolynom.h   2009-06-17 21:01:33.000000000 +0200
 257 @@ -28,7 +28,9 @@
 258  #ifndef CLMULTIPOLY_H
 259  #define CLMULTIPOLY_H
 260
 261 -#include <iostream.h>
 262 +#include <iostream>
 263 +
 264 +using namespace std;
 265
 266  #define  VARIABLE_X         0
 267  #define  VARIABLE_Y         1
 268 diff -aur surf-1.0.5.orig/gtkgui/ClipWindow.cc surf-1.0.5/gtkgui/ClipWindow.cc
 269 --- surf-1.0.5.orig/gtkgui/ClipWindow.cc        2006-03-04 22:48:28.000000000 +0100
 270 +++ surf-1.0.5/gtkgui/ClipWindow.cc     2009-06-17 21:01:33.000000000 +0200
 271 @@ -24,7 +24,7 @@
 272
 273
 274  #include <string.h>
 275 -#include <iostream.h>
 276 +#include <iostream>
 277  #include "ClipWindow.h"
 278  #include "RadioButtonBuilder.h"
 279  #include "OptionMenuBuilder.h"
 280 diff -aur surf-1.0.5.orig/gtkgui/ColorSelectionButton.cc surf-1.0.5/gtkgui/ColorSelectionButton.cc
 281 --- surf-1.0.5.orig/gtkgui/ColorSelectionButton.cc      2006-03-04 22:48:28.000000000 +0100
 282 +++ surf-1.0.5/gtkgui/ColorSelectionButton.cc   2009-06-17 21:01:33.000000000 +0200
 283 @@ -25,7 +25,7 @@
 284
 285  #include <assert.h>
 286  #include <stdio.h>
 287 -#include <iostream.h>
 288 +#include <iostream>
 289
 290  #include "ColorSelectionButton.h"
 291
 292 diff -aur surf-1.0.5.orig/gtkgui/ConfigurationWindow.h surf-1.0.5/gtkgui/ConfigurationWindow.h
 293 --- surf-1.0.5.orig/gtkgui/ConfigurationWindow.h        2006-03-04 22:11:58.000000000 +0100
 294 +++ surf-1.0.5/gtkgui/ConfigurationWindow.h     2009-06-17 21:01:33.000000000 +0200
 295 @@ -26,7 +26,7 @@
 296  #ifndef CONFIGURATIONWINDOW_H
 297  #define CONFIGURATIONWINDOW_H
 298
 299 -#include <iostream.h>
 300 +#include <iostream>
 301  #include "mygtk.h"
 302
 303  #include "ParameterWindow.h"
 304 diff -aur surf-1.0.5.orig/gtkgui/DitherWindow.cc surf-1.0.5/gtkgui/DitherWindow.cc
 305 --- surf-1.0.5.orig/gtkgui/DitherWindow.cc      2006-03-04 22:48:28.000000000 +0100
 306 +++ surf-1.0.5/gtkgui/DitherWindow.cc   2009-06-17 21:01:33.000000000 +0200
 307 @@ -23,7 +23,7 @@
 308   */
 309
 310
 311 -#include <iostream.h>
 312 +#include <iostream>
 313  #include "DitherWindow.h"
 314  #include "RadioButtonBuilder.h"
 315  #include "TableBuilder.h"
 316 diff -aur surf-1.0.5.orig/gtkgui/Document.cc surf-1.0.5/gtkgui/Document.cc
 317 --- surf-1.0.5.orig/gtkgui/Document.cc  2006-03-04 22:48:28.000000000 +0100
 318 +++ surf-1.0.5/gtkgui/Document.cc       2009-06-17 21:01:33.000000000 +0200
 319 @@ -24,7 +24,7 @@
 320
 321
 322  #include <assert.h>
 323 -#include <iostream.h>
 324 +#include <iostream>
 325  #include <stdio.h>
 326  #include <string.h>
 327
 328 diff -aur surf-1.0.5.orig/gtkgui/DrawingArea.cc surf-1.0.5/gtkgui/DrawingArea.cc
 329 --- surf-1.0.5.orig/gtkgui/DrawingArea.cc       2006-03-04 22:48:28.000000000 +0100
 330 +++ surf-1.0.5/gtkgui/DrawingArea.cc    2009-06-17 21:01:33.000000000 +0200
 331 @@ -23,7 +23,7 @@
 332   */
 333
 334
 335 -#include <iostream.h>
 336 +#include <iostream>
 337
 338  #include <gdk/gdkx.h>
 339
 340 diff -aur surf-1.0.5.orig/gtkgui/NumericWindow.h surf-1.0.5/gtkgui/NumericWindow.h
 341 --- surf-1.0.5.orig/gtkgui/NumericWindow.h      2006-03-04 22:11:58.000000000 +0100
 342 +++ surf-1.0.5/gtkgui/NumericWindow.h   2009-06-17 21:01:33.000000000 +0200
 343 @@ -26,7 +26,7 @@
 344  #ifndef NUMERICWINDOW_H
 345  #define NUMERICWINDOW_H
 346
 347 -#include <iostream.h>
 348 +#include <iostream>
 349  #include <gtk/gtk.h>
 350  #include "mygtk.h"
 351
 352 diff -aur surf-1.0.5.orig/gtkgui/ProgressDialog.cc surf-1.0.5/gtkgui/ProgressDialog.cc
 353 --- surf-1.0.5.orig/gtkgui/ProgressDialog.cc    2006-03-04 22:48:28.000000000 +0100
 354 +++ surf-1.0.5/gtkgui/ProgressDialog.cc 2009-06-17 21:01:33.000000000 +0200
 355 @@ -23,7 +23,7 @@
 356   */
 357
 358
 359 -#include <iostream.h>
 360 +#include <iostream>
 361
 362  #include "ProgressDialog.h"
 363  #include "Thread.h"
 364 diff -aur surf-1.0.5.orig/gtkgui/Requester.cc surf-1.0.5/gtkgui/Requester.cc
 365 --- surf-1.0.5.orig/gtkgui/Requester.cc 2006-03-04 22:48:28.000000000 +0100
 366 +++ surf-1.0.5/gtkgui/Requester.cc      2009-06-17 21:01:33.000000000 +0200
 367 @@ -24,7 +24,7 @@
 368
 369
 370  #include <assert.h>
 371 -#include <iostream.h>
 372 +#include <iostream>
 373  #include <strstream>
 374
 375  #include <gtk/gtk.h>
 376 diff -aur surf-1.0.5.orig/gtkgui/mycolor.cc surf-1.0.5/gtkgui/mycolor.cc
 377 --- surf-1.0.5.orig/gtkgui/mycolor.cc   2006-03-04 22:48:28.000000000 +0100
 378 +++ surf-1.0.5/gtkgui/mycolor.cc        2009-06-17 21:01:33.000000000 +0200
 379 @@ -24,7 +24,7 @@
 380
 381
 382  #include <assert.h>
 383 -#include <iostream.h>
 384 +#include <iostream>
 385  #include <stdlib.h>
 386  #include <strstream>
 387
 388 @@ -42,6 +42,8 @@
 389  #include "mycolor.h"
 390  #include "Misc.h"
 391
 392 +using namespace std;
 393 +
 394  // These are not declared static...they get used in SurfDrawingArea...
 395  Display * xdisplay        = 0;
 396  XStandardColormap *xstandardColormap = 0;
 397 diff -aur surf-1.0.5.orig/gtkgui/mygtk.h surf-1.0.5/gtkgui/mygtk.h
 398 --- surf-1.0.5.orig/gtkgui/mygtk.h      2006-03-04 22:11:58.000000000 +0100
 399 +++ surf-1.0.5/gtkgui/mygtk.h   2009-06-17 21:02:38.000000000 +0200
 400 @@ -28,7 +28,9 @@
 401
 402  #include <stdlib.h>
 403  #include <gtk/gtk.h>
 404 -#include <iostream.h>
 405 +#include <iostream>
 406 +
 407 +using namespace std;
 408
 409  #define RECALL(method,klass)                                                   \
 410  static void _ ## method (klass *k)                                             \
 411 diff -aur surf-1.0.5.orig/gtkgui/showAbout.cc surf-1.0.5/gtkgui/showAbout.cc
 412 --- surf-1.0.5.orig/gtkgui/showAbout.cc 2006-03-04 22:48:28.000000000 +0100
 413 +++ surf-1.0.5/gtkgui/showAbout.cc      2009-06-17 21:01:33.000000000 +0200
 414 @@ -24,7 +24,7 @@
 415
 416
 417  #include <stdio.h>
 418 -#include <iostream.h>
 419 +#include <iostream>
 420
 421  #include <gtk/gtk.h>
 422
 423 diff -aur surf-1.0.5.orig/gtkgui/start.cc surf-1.0.5/gtkgui/start.cc
 424 --- surf-1.0.5.orig/gtkgui/start.cc     2006-03-04 22:48:28.000000000 +0100
 425 +++ surf-1.0.5/gtkgui/start.cc  2009-06-17 21:01:33.000000000 +0200
 426 @@ -23,7 +23,7 @@
 427   */
 428
 429
 430 -#include <iostream.h>
 431 +#include <iostream>
 432
 433  #include "mygtk.h"
 434  #include "GuiThread.h"
 435 diff -aur surf-1.0.5.orig/misc/Misc.cc surf-1.0.5/misc/Misc.cc
 436 --- surf-1.0.5.orig/misc/Misc.cc        2006-03-04 22:48:28.000000000 +0100
 437 +++ surf-1.0.5/misc/Misc.cc     2009-06-17 21:01:33.000000000 +0200
 438 @@ -23,7 +23,9 @@
 439   */
 440
 441
 442 -#include <iostream.h>
 443 +#include <iostream>
 444 +
 445 +using namespace std;
 446
 447  #include "Misc.h"
 448
 449 diff -aur surf-1.0.5.orig/mt/GuiThread.cc surf-1.0.5/mt/GuiThread.cc
 450 --- surf-1.0.5.orig/mt/GuiThread.cc     2006-03-04 22:48:28.000000000 +0100
 451 +++ surf-1.0.5/mt/GuiThread.cc  2009-06-17 21:01:33.000000000 +0200
 452 @@ -27,7 +27,7 @@
 453
 454  #include <unistd.h>
 455  #include <assert.h>
 456 -#include <iostream.h>
 457 +#include <iostream>
 458  #include <fcntl.h>
 459  #include <stdio.h>
 460  #include <errno.h>
 461 diff -aur surf-1.0.5.orig/mt/Thread.cc surf-1.0.5/mt/Thread.cc
 462 --- surf-1.0.5.orig/mt/Thread.cc        2006-03-04 22:48:28.000000000 +0100
 463 +++ surf-1.0.5/mt/Thread.cc     2009-06-17 21:01:33.000000000 +0200
 464 @@ -23,9 +23,11 @@
 465   */
 466
 467
 468 -#include <iostream.h>
 469 +#include <iostream>
 470  #include <pthread.h>
 471
 472 +using namespace std;
 473 +
 474  #include "Thread.h"
 475
 476  // #define DEBUG
 477 diff -aur surf-1.0.5.orig/src/RgbBuffer.cc surf-1.0.5/src/RgbBuffer.cc
 478 --- surf-1.0.5.orig/src/RgbBuffer.cc    2006-03-05 21:55:15.000000000 +0100
 479 +++ surf-1.0.5/src/RgbBuffer.cc 2009-06-17 21:01:33.000000000 +0200
 480 @@ -36,10 +36,11 @@
 481
 482  #include <math.h>
 483  #include <stdlib.h>
 484 -#include <iostream.h>
 485 +#include <iostream>
 486  #include <stdio.h>
 487  #include <string.h>
 488
 489 +using namespace std;
 490
 491  #include "def.h"
 492  #include "compfn.h"
 493 diff -aur surf-1.0.5.orig/src/bit_buffer.cc surf-1.0.5/src/bit_buffer.cc
 494 --- surf-1.0.5.orig/src/bit_buffer.cc   2006-03-04 22:48:28.000000000 +0100
 495 +++ surf-1.0.5/src/bit_buffer.cc        2009-06-17 21:01:33.000000000 +0200
 496 @@ -24,7 +24,9 @@
 497
 498
 499  #include <limits.h>
 500 -#include <iostream.h>
 501 +#include <iostream>
 502 +
 503 +using namespace std;
 504
 505  #include "bit_buffer.h"
 506
 507 diff -aur surf-1.0.5.orig/src/main.cc surf-1.0.5/src/main.cc
 508 --- surf-1.0.5.orig/src/main.cc 2006-03-04 22:48:28.000000000 +0100
 509 +++ surf-1.0.5/src/main.cc      2009-06-17 21:01:33.000000000 +0200
 510 @@ -22,7 +22,7 @@
 511   *
 512   */
 513
 514 -#include <iostream.h>
 515 +#include <iostream>
 516  #include <string.h>
 517  #include <stdlib.h>
 518  #include <signal.h>
 519 @@ -31,6 +31,8 @@
 520  #include "compfn.h"
 521  #include "Options.h"
 522
 523 +using namespace std;
 524 +
 525  extern void start_gtk_main();
 526
 527  Options* options;
 528 diff -aur surf-1.0.5.orig/yaccsrc/Script.cc surf-1.0.5/yaccsrc/Script.cc
 529 --- surf-1.0.5.orig/yaccsrc/Script.cc   2006-03-04 22:48:28.000000000 +0100
 530 +++ surf-1.0.5/yaccsrc/Script.cc        2009-06-17 21:01:33.000000000 +0200
 531 @@ -27,12 +27,12 @@
 532  #include <stdio.h>
 533  #include <errno.h>
 534
 535 -#include <iostream.h>
 536 +#include <iostream>
 537
 538  #include <sys/stat.h>
 539  #include <unistd.h>
 540
 541 -
 542 +using namespace std;
 543
 544  #include "FileWriter.h"
 545  #include "TreePolynom.h"
 546 diff -aur surf-1.0.5.orig/yaccsrc/SymbolTable.cc surf-1.0.5/yaccsrc/SymbolTable.cc
 547 --- surf-1.0.5.orig/yaccsrc/SymbolTable.cc      2006-03-04 22:48:28.000000000 +0100
 548 +++ surf-1.0.5/yaccsrc/SymbolTable.cc   2009-06-17 21:01:33.000000000 +0200
 549 @@ -23,8 +23,7 @@
 550   */
 551
 552
 553 -#include <iostream.h>
 554 -#include <iostream.h>
 555 +#include <iostream>
 556  #include <assert.h>
 557  #include <stdlib.h>
 558
 559 @@ -32,6 +31,7 @@
 560  #include "SymbolTable.h"
 561  #include "addDefaultSymbols.h"
 562
 563 +using namespace std;
 564
 565  inline char *copy (const char *str)
 566  {
 567 diff -aur surf-1.0.5.orig/yaccsrc/SymbolTable.h surf-1.0.5/yaccsrc/SymbolTable.h
 568 --- surf-1.0.5.orig/yaccsrc/SymbolTable.h       2006-03-04 22:11:57.000000000 +0100
 569 +++ surf-1.0.5/yaccsrc/SymbolTable.h    2009-06-17 21:01:33.000000000 +0200
 570 @@ -28,9 +28,11 @@
 571
 572  #include <stdlib.h>
 573
 574 -#include <iostream.h>
 575 +#include <iostream>
 576  #include <stdio.h>
 577
 578 +using namespace std;
 579 +
 580  class SymbolTable
 581  {
 582  public:
 583 diff -aur surf-1.0.5.orig/yaccsrc/mymemory.cc surf-1.0.5/yaccsrc/mymemory.cc
 584 --- surf-1.0.5.orig/yaccsrc/mymemory.cc 2006-03-04 22:48:28.000000000 +0100
 585 +++ surf-1.0.5/yaccsrc/mymemory.cc      2009-06-17 21:01:33.000000000 +0200
 586 @@ -32,9 +32,11 @@
 587  /* Date:     14.8.94                                                         */
 588  /* ------------------------------------------------------------------------- */
 589
 590 -#include <iostream.h>
 591 +#include <iostream>
 592  #include <stdlib.h>
 593
 594 +using namespace std;
 595 +
 596  #include "mymemory.h"
 597
 598  char    *new_char ( int n )
 599 diff -aur surf-1.0.5.orig/yaccsrc/polyx.h surf-1.0.5/yaccsrc/polyx.h
 600 --- surf-1.0.5.orig/yaccsrc/polyx.h     2006-03-04 22:11:57.000000000 +0100
 601 +++ surf-1.0.5/yaccsrc/polyx.h  2009-06-17 21:01:33.000000000 +0200
 602 @@ -26,7 +26,9 @@
 603  #ifndef POLYX_H
 604  #define POLYX_H
 605
 606 -#include <iostream.h>
 607 +#include <iostream>
 608 +
 609 +using namespace std;
 610
 611  /*****************************************************************************/
 612  /*  POLYNIMIALS IN X                                                         */