xbase/xbase-2.0.0-gcc43.patch

   1 diff -up xbase-2.0.0/xbase/xbstring.h.gcc43 xbase-2.0.0/xbase/xbstring.h
   2 --- xbase-2.0.0/xbase/xbstring.h.gcc43  2001-01-27 06:00:32.000000000 +0100
   3 +++ xbase-2.0.0/xbase/xbstring.h        2008-03-11 20:21:20.000000000 +0100
   4 @@ -56,7 +56,7 @@
   5  #endif
   6
   7  #include <stdlib.h>
   8 -#include <iostream.h>
   9 +#include <iostream>
  10
  11  /*! \file xbstring.h
  12  */
  13 @@ -119,7 +119,7 @@ public:
  14    bool operator <= ( const xbString& ) const;
  15    bool operator >= ( const xbString& ) const;
  16
  17 -  friend ostream& operator << ( ostream&, const xbString& );
  18 +  friend std::ostream& operator << ( std::ostream&, const xbString& );
  19
  20    xbString &remove(size_t pos = 0, int n = npos);
  21    xbString mid(size_t pos = 0, int n = npos) const;
  22 diff -up xbase-2.0.0/xbase/dbf.cpp.gcc43 xbase-2.0.0/xbase/dbf.cpp
  23 --- xbase-2.0.0/xbase/dbf.cpp.gcc43     2008-03-11 20:24:01.000000000 +0100
  24 +++ xbase-2.0.0/xbase/dbf.cpp   2008-03-11 20:25:01.000000000 +0100
  25 @@ -79,6 +79,9 @@
  26
  27  #include <xbase/xbexcept.h>
  28
  29 +using std::cout;
  30 +using std::endl;
  31 +
  32  /*! \file dbf.cpp
  33  */
  34
  35 diff -up xbase-2.0.0/xbase/xbstring.cpp.gcc43 xbase-2.0.0/xbase/xbstring.cpp
  36 --- xbase-2.0.0/xbase/xbstring.cpp.gcc43        2008-03-11 20:33:00.000000000 +0100
  37 +++ xbase-2.0.0/xbase/xbstring.cpp      2008-03-11 20:33:00.000000000 +0100
  38 @@ -582,7 +582,7 @@ bool xbString::operator>=( const xbStrin
  39  //! Short description.
  40  /*!
  41  */
  42 -XBDLLEXPORT ostream& operator << ( ostream& os, const xbString& xbs ) {
  43 +XBDLLEXPORT std::ostream& operator << ( std::ostream& os, const xbString& xbs ) {
  44    return os << xbs.data;
  45  }
  46
  47 diff -up xbase-2.0.0/xbase/exp.cpp.gcc43 xbase-2.0.0/xbase/exp.cpp
  48 --- xbase-2.0.0/xbase/exp.cpp.gcc43     2008-03-11 20:23:54.000000000 +0100
  49 +++ xbase-2.0.0/xbase/exp.cpp   2008-03-11 20:24:30.000000000 +0100
  50 @@ -64,6 +64,8 @@
  51
  52  #include <xbase/xbexcept.h>
  53
  54 +using std::cout;
  55 +
  56  /*! \file exp.cpp
  57  */
  58
  59 diff -up xbase-2.0.0/xbase/html.cpp.gcc43 xbase-2.0.0/xbase/html.cpp
  60 --- xbase-2.0.0/xbase/html.cpp.gcc43    2008-03-11 20:27:18.000000000 +0100
  61 +++ xbase-2.0.0/xbase/html.cpp  2008-03-11 20:28:56.000000000 +0100
  62 @@ -68,6 +68,9 @@
  63
  64  #include <xbase/xbexcept.h>
  65
  66 +using std::cout;
  67 +using std::endl;
  68 +
  69  /*! \file html.cpp
  70  */
  71
  72 diff -up xbase-2.0.0/xbase/ntx.cpp.gcc43 xbase-2.0.0/xbase/ntx.cpp
  73 --- xbase-2.0.0/xbase/ntx.cpp.gcc43     2008-03-11 20:33:48.000000000 +0100
  74 +++ xbase-2.0.0/xbase/ntx.cpp   2008-03-11 20:33:59.000000000 +0100
  75 @@ -75,6 +75,9 @@
  76
  77  #include <xbase/xbexcept.h>
  78
  79 +using std::cout;
  80 +using std::endl;
  81 +
  82  /*! \file ntx.cpp
  83  */
  84
  85 diff -up xbase-2.0.0/xbase/xbase.cpp.gcc43 xbase-2.0.0/xbase/xbase.cpp
  86 --- xbase-2.0.0/xbase/xbase.cpp.gcc43   2008-03-11 20:32:08.000000000 +0100
  87 +++ xbase-2.0.0/xbase/xbase.cpp 2008-03-11 20:32:08.000000000 +0100
  88 @@ -62,6 +62,9 @@
  89
  90  #include <xbase/xbexcept.h>
  91
  92 +using std::cout;
  93 +using std::endl;
  94 +
  95  /*! \file xbase.cpp
  96  */
  97
  98 diff -up xbase-2.0.0/xbase/stack.cpp.gcc43 xbase-2.0.0/xbase/stack.cpp
  99 --- xbase-2.0.0/xbase/stack.cpp.gcc43   2000-11-10 20:04:17.000000000 +0100
 100 +++ xbase-2.0.0/xbase/stack.cpp 2008-03-11 20:31:16.000000000 +0100
 101 @@ -59,10 +59,12 @@
 102
 103  #include <string.h>
 104  #include <stdlib.h>
 105 -#include <iostream.h>
 106 +#include <iostream>
 107
 108  #include <xbase/xstack.h>
 109
 110 +using std::cout;
 111 +
 112  /*! \file stack.cpp
 113  */
 114
 115 diff -up xbase-2.0.0/xbase/ndx.cpp.gcc43 xbase-2.0.0/xbase/ndx.cpp
 116 --- xbase-2.0.0/xbase/ndx.cpp.gcc43     2001-03-21 01:28:53.000000000 +0100
 117 +++ xbase-2.0.0/xbase/ndx.cpp   2008-03-11 20:21:20.000000000 +0100
 118 @@ -66,7 +66,9 @@
 119  #endif
 120
 121  #include <xbase/xbase.h>
 122 -#include <iostream.h>
 123 +#include <iostream>
 124 +
 125 +using std::cout;
 126
 127  #ifdef XB_INDEX_NDX
 128
 129 diff -up xbase-2.0.0/xbase/expfunc.cpp.gcc43 xbase-2.0.0/xbase/expfunc.cpp
 130 --- xbase-2.0.0/xbase/expfunc.cpp.gcc43 2008-03-11 20:26:54.000000000 +0100
 131 +++ xbase-2.0.0/xbase/expfunc.cpp       2008-03-11 20:26:54.000000000 +0100
 132 @@ -64,6 +64,7 @@
 133  #include <xbase/exp.h>
 134  #include <xbase/xbexcept.h>
 135
 136 +using std::cout;
 137
 138  /*! \file expfunc.cpp
 139  */
 140 diff -up xbase-2.0.0/xbase/memo.cpp.gcc43 xbase-2.0.0/xbase/memo.cpp
 141 --- xbase-2.0.0/xbase/memo.cpp.gcc43    2008-03-11 20:30:29.000000000 +0100
 142 +++ xbase-2.0.0/xbase/memo.cpp  2008-03-11 20:30:40.000000000 +0100
 143 @@ -59,6 +59,8 @@
 144  #include <stdio.h>
 145  #include <xbase/xbexcept.h>
 146
 147 +using std::cout;
 148 +
 149  /*! \file memo.cpp
 150  */
 151
 152 diff -up xbase-2.0.0/xbase/xbfilter.cpp.gcc43 xbase-2.0.0/xbase/xbfilter.cpp
 153 --- xbase-2.0.0/xbase/xbfilter.cpp.gcc43        2008-03-11 20:34:21.000000000 +0100
 154 +++ xbase-2.0.0/xbase/xbfilter.cpp      2008-03-11 20:34:25.000000000 +0100
 155 @@ -60,6 +60,9 @@
 156  #include <xbase/xbase.h>
 157  #include <xbase/xbexcept.h>
 158
 159 +using std::cout;
 160 +using std::endl;
 161 +
 162  /*! \file xbfilter.cpp
 163  */
 164
 165 diff -up xbase-2.0.0/xbase/html.h.gcc43 xbase-2.0.0/xbase/html.h
 166 --- xbase-2.0.0/xbase/html.h.gcc43      2008-03-11 20:25:52.000000000 +0100
 167 +++ xbase-2.0.0/xbase/html.h    2008-03-11 20:26:22.000000000 +0100
 168 @@ -66,6 +66,8 @@
 169
 170  #include <xbase/xtypes.h>
 171
 172 +#include <iostream>
 173 +
 174  /*! \file html.h
 175  */
 176
 177 @@ -92,28 +94,28 @@ public:
 178     //! Short description.
 179     /*!
 180     */
 181 -   void   BoldOff( void ) { cout << "</b>\n"; };
 182 +   void   BoldOff( void ) { std::cout << "</b>\n"; };
 183     //! Short description.
 184     /*!
 185     */
 186 -   void   BoldOn( void ) { cout << "<b>"; };
 187 +   void   BoldOn( void ) { std::cout << "<b>"; };
 188     //! Short description.
 189     /*!
 190     */
 191 -   void   Bullet( void ) { cout << "<li>"; };
 192 +   void   Bullet( void ) { std::cout << "<li>"; };
 193     void   DumpArray( void );
 194     //! Short description.
 195     /*!
 196     */
 197 -   void   EmphasizeOff( void ) { cout << "</em>\n"; };
 198 +   void   EmphasizeOff( void ) { std::cout << "</em>\n"; };
 199     //! Short description.
 200     /*!
 201     */
 202 -   void   EmphasizeOn( void ) { cout << "<em>"; };
 203 +   void   EmphasizeOn( void ) { std::cout << "<em>"; };
 204     //! Short description.
 205     /*!
 206     */
 207 -   void   EndHtmlPage( void ) { cout << "</BODY>\n</HTML>\n"; }
 208 +   void   EndHtmlPage( void ) { std::cout << "</BODY>\n</HTML>\n"; }
 209     xbShort  GenFormFields(xbDbf *d, xbShort Option,const char * Title,xbFieldList *fl);
 210     xbShort  GetArrayNo( const char * FieldName );
 211     const  char * GetCookie( const char *CookieName );
 212 @@ -124,47 +126,47 @@ public:
 213     //! Short description.
 214     /*!
 215     */
 216 -   void   HeaderOff( xbShort i ){ cout << "</h" << i << ">\n"; };
 217 +   void   HeaderOff( xbShort i ){ std::cout << "</h" << i << ">\n"; };
 218     //! Short description.
 219     /*!
 220     */
 221 -   void   HeaderOn( xbShort i ){ cout << "<h" << i << ">\n"; };
 222 +   void   HeaderOn( xbShort i ){ std::cout << "<h" << i << ">\n"; };
 223     //! Short description.
 224     /*!
 225     */
 226 -   void   ItalicOff( void ) { cout << "</i>\n"; };
 227 +   void   ItalicOff( void ) { std::cout << "</i>\n"; };
 228     //! Short description.
 229     /*!
 230     */
 231 -   void   ItalicOn( void ) { cout << "<i>"; };
 232 +   void   ItalicOn( void ) { std::cout << "<i>"; };
 233     //! Short description.
 234     /*!
 235     */
 236 -   void   NewLine( void ) { cout << "<br>"; }
 237 +   void   NewLine( void ) { std::cout << "<br>"; }
 238     xbShort  PostMethod( void );
 239     void   PrintEncodedChar( char );
 240     void   PrintEncodedString( const char *s );
 241     //! Short description.
 242     /*!
 243     */
 244 -   void   PrintHtml( char * s ) { cout << s; };
 245 +   void   PrintHtml( char * s ) { std::cout << s; };
 246     //! Short description.
 247     /*!
 248     */
 249 -   void   PrintHtml( xbLong l ) { cout << l; };
 250 +   void   PrintHtml( xbLong l ) { std::cout << l; };
 251     //! Short description.
 252     /*!
 253     */
 254 -   void   PrintHtml( xbShort i ) { cout << i; };
 255 +   void   PrintHtml( xbShort i ) { std::cout << i; };
 256     //! Short description.
 257     /*!
 258     */
 259 -   void   PrintHtml( int i ) { cout << i; };
 260 +   void   PrintHtml( int i ) { std::cout << i; };
 261     void   StartHtmlPage( const char *Title );
 262     //! Short description.
 263     /*!
 264     */
 265 -   void   StartTextPage( void ) { cout << "Content-type: text/plain\n\n"; }
 266 +   void   StartTextPage( void ) { std::cout << "Content-type: text/plain\n\n"; }
 267     void   TextOut( const char *String );
 268     xbLong   Tally( const char *FileName );
 269     xbShort  SetCookie(const char *Name, const char *Value, const char *ExpDate,
 270 diff -up xbase-2.0.0/xbase/dbf.h.gcc43 xbase-2.0.0/xbase/dbf.h
 271 --- xbase-2.0.0/xbase/dbf.h.gcc43       2001-01-13 21:20:53.000000000 +0100
 272 +++ xbase-2.0.0/xbase/dbf.h     2008-03-11 20:21:20.000000000 +0100
 273 @@ -65,7 +65,6 @@
 274  #include <xbase/xtypes.h>
 275  #include <xbase/xdate.h>
 276
 277 -#include <iostream.h>
 278  #include <stdio.h>
 279
 280  /*! \file dbf.h
 281 diff -up xbase-2.0.0/examples/sample1.cpp.gcc43 xbase-2.0.0/examples/sample1.cpp
 282 --- xbase-2.0.0/examples/sample1.cpp.gcc43      2008-03-11 20:35:01.000000000 +0100
 283 +++ xbase-2.0.0/examples/sample1.cpp    2008-03-11 20:36:40.000000000 +0100
 284 @@ -47,6 +47,8 @@
 285
 286  #include <xbase/xbase.h>
 287
 288 +using std::cout;
 289 +
 290  /* set the stack large for dos compiles */
 291  #ifdef __XBDOS
 292  #include <stdio.h>
 293 diff -up xbase-2.0.0/examples/sample2.cpp.gcc43 xbase-2.0.0/examples/sample2.cpp
 294 --- xbase-2.0.0/examples/sample2.cpp.gcc43      2008-03-11 20:36:03.000000000 +0100
 295 +++ xbase-2.0.0/examples/sample2.cpp    2008-03-11 20:36:41.000000000 +0100
 296 @@ -53,6 +53,8 @@
 297
 298  #include <xbase/xbase.h>
 299
 300 +using std::cout;
 301 +
 302  /* set the stack large for dos compiles */
 303  #ifdef __XBDOS
 304  #include <stdio.h>
 305 diff -up xbase-2.0.0/examples/sample5.cpp.gcc43 xbase-2.0.0/examples/sample5.cpp
 306 --- xbase-2.0.0/examples/sample5.cpp.gcc43      2008-03-11 20:36:36.000000000 +0100
 307 +++ xbase-2.0.0/examples/sample5.cpp    2008-03-11 20:36:40.000000000 +0100
 308 @@ -45,6 +45,8 @@
 309
 310  #include <xbase/xbase.h>
 311
 312 +using std::cout;
 313 +
 314  /* set the stack large for dos compiles */
 315  #ifdef __XBDOS
 316  #include <stdio.h>
 317 diff -up xbase-2.0.0/examples/sample4.cpp.gcc43 xbase-2.0.0/examples/sample4.cpp
 318 --- xbase-2.0.0/examples/sample4.cpp.gcc43      2008-03-11 20:36:25.000000000 +0100
 319 +++ xbase-2.0.0/examples/sample4.cpp    2008-03-11 20:36:47.000000000 +0100
 320 @@ -51,6 +51,8 @@
 321
 322  #include <xbase/xbase.h>
 323
 324 +using std::cout;
 325 +
 326  #ifdef __XBDOS
 327  #include <stdio.h>
 328  extern unsigned _stklen = 100000;
 329 diff -up xbase-2.0.0/examples/exfilter.cpp.gcc43 xbase-2.0.0/examples/exfilter.cpp
 330 --- xbase-2.0.0/examples/exfilter.cpp.gcc43     2008-03-11 20:37:14.000000000 +0100
 331 +++ xbase-2.0.0/examples/exfilter.cpp   2008-03-11 20:37:28.000000000 +0100
 332 @@ -50,6 +50,8 @@
 333
 334  #include <xbase/xbase.h>
 335
 336 +using std::cout;
 337 +using std::endl;
 338
 339  int main()
 340  {
 341 diff -up xbase-2.0.0/examples/sample3.cpp.gcc43 xbase-2.0.0/examples/sample3.cpp
 342 --- xbase-2.0.0/examples/sample3.cpp.gcc43      2008-03-11 20:36:10.000000000 +0100
 343 +++ xbase-2.0.0/examples/sample3.cpp    2008-03-11 20:36:46.000000000 +0100
 344 @@ -54,6 +54,9 @@
 345
 346  #include <xbase/xbase.h>
 347
 348 +using std::cout;
 349 +using std::endl;
 350 +
 351  /* set the stack large for dos compiles */
 352  #ifdef __XBDOS
 353  #include <stdio.h>
 354 diff -up xbase-2.0.0/bin/undelall.cpp.gcc43 xbase-2.0.0/bin/undelall.cpp
 355 --- xbase-2.0.0/bin/undelall.cpp.gcc43  2008-03-11 20:39:22.000000000 +0100
 356 +++ xbase-2.0.0/bin/undelall.cpp        2008-03-11 20:40:33.000000000 +0100
 357 @@ -45,6 +45,9 @@
 358
 359  #include <xbase/xbase.h>
 360
 361 +using std::cout;
 362 +using std::endl;
 363 +
 364  int main(int ac,char** av)
 365  {
 366      if (ac <= 1) {
 367 diff -up xbase-2.0.0/bin/checkndx.cpp.gcc43 xbase-2.0.0/bin/checkndx.cpp
 368 --- xbase-2.0.0/bin/checkndx.cpp.gcc43  2008-03-11 20:39:22.000000000 +0100
 369 +++ xbase-2.0.0/bin/checkndx.cpp        2008-03-11 20:40:29.000000000 +0100
 370 @@ -45,6 +45,8 @@
 371
 372  #include "xbase/xbase.h"
 373
 374 +using std::cout;
 375 +
 376  int main(int ac,char** av)
 377  {
 378  #ifdef XBASE_DEBUG
 379 diff -up xbase-2.0.0/bin/packdbf.cpp.gcc43 xbase-2.0.0/bin/packdbf.cpp
 380 --- xbase-2.0.0/bin/packdbf.cpp.gcc43   2008-03-11 20:39:22.000000000 +0100
 381 +++ xbase-2.0.0/bin/packdbf.cpp 2008-03-11 20:40:32.000000000 +0100
 382 @@ -46,6 +46,9 @@
 383
 384  #include <xbase/xbase.h>
 385
 386 +using std::cout;
 387 +using std::endl;
 388 +
 389  int main(int ac,char** av)
 390  {
 391      if (ac <= 1) {
 392 diff -up xbase-2.0.0/bin/zap.cpp.gcc43 xbase-2.0.0/bin/zap.cpp
 393 --- xbase-2.0.0/bin/zap.cpp.gcc43       2008-03-11 20:39:22.000000000 +0100
 394 +++ xbase-2.0.0/bin/zap.cpp     2008-03-11 20:40:33.000000000 +0100
 395 @@ -45,6 +45,9 @@
 396
 397  #include <xbase/xbase.h>
 398
 399 +using std::cout;
 400 +using std::endl;
 401 +
 402  int main(int ac,char** av)
 403  {
 404     if (ac <= 1) {
 405 diff -up xbase-2.0.0/bin/reindex.cpp.gcc43 xbase-2.0.0/bin/reindex.cpp
 406 --- xbase-2.0.0/bin/reindex.cpp.gcc43   2008-03-11 20:39:22.000000000 +0100
 407 +++ xbase-2.0.0/bin/reindex.cpp 2008-03-11 20:40:32.000000000 +0100
 408 @@ -47,6 +47,9 @@
 409
 410  #include <xbase/xbase.h>
 411
 412 +using std::cout;
 413 +using std::endl;
 414 +
 415  static void
 416  showStatus(xbLong itemNum, xbLong numItems)
 417  {
 418 diff -up xbase-2.0.0/bin/copydbf.cpp.gcc43 xbase-2.0.0/bin/copydbf.cpp
 419 --- xbase-2.0.0/bin/copydbf.cpp.gcc43   2008-03-11 20:39:22.000000000 +0100
 420 +++ xbase-2.0.0/bin/copydbf.cpp 2008-03-11 20:40:29.000000000 +0100
 421 @@ -44,6 +44,8 @@
 422
 423  #include <xbase/xbase.h>
 424
 425 +using std::cout;
 426 +
 427  int main(int ac,char** av)
 428  {
 429     if (3 != ac) {
 430 diff -up xbase-2.0.0/bin/deletall.cpp.gcc43 xbase-2.0.0/bin/deletall.cpp
 431 --- xbase-2.0.0/bin/deletall.cpp.gcc43  2008-03-11 20:39:22.000000000 +0100
 432 +++ xbase-2.0.0/bin/deletall.cpp        2008-03-11 20:40:30.000000000 +0100
 433 @@ -45,6 +45,9 @@
 434
 435  #include <xbase/xbase.h>
 436
 437 +using std::cout;
 438 +using std::endl;
 439 +
 440  int main(int ac,char** av)
 441  {
 442      if (ac <= 1) {
 443 diff -up xbase-2.0.0/bin/dumphdr.cpp.gcc43 xbase-2.0.0/bin/dumphdr.cpp
 444 --- xbase-2.0.0/bin/dumphdr.cpp.gcc43   2008-03-11 20:39:22.000000000 +0100
 445 +++ xbase-2.0.0/bin/dumphdr.cpp 2008-03-11 20:40:31.000000000 +0100
 446 @@ -47,6 +47,9 @@
 447
 448  #include <xbase/xbase.h>
 449
 450 +using std::cout;
 451 +using std::endl;
 452 +
 453  int main( int ac, char ** av )
 454  {
 455  #ifdef XBASE_DEBUG
 456 diff -up xbase-2.0.0/bin/dumprecs.cpp.gcc43 xbase-2.0.0/bin/dumprecs.cpp
 457 --- xbase-2.0.0/bin/dumprecs.cpp.gcc43  2008-03-11 20:39:22.000000000 +0100
 458 +++ xbase-2.0.0/bin/dumprecs.cpp        2008-03-11 20:40:31.000000000 +0100
 459 @@ -52,6 +52,9 @@
 460  #include <xbase/xbexcept.h>
 461  #endif
 462
 463 +using std::cout;
 464 +using std::endl;
 465 +
 466  int main(int ac,char** av)
 467  {
 468      if (ac <= 1) {
 469 diff -up xbase-2.0.0/bin/dumpdbt.cpp.gcc43 xbase-2.0.0/bin/dumpdbt.cpp
 470 --- xbase-2.0.0/bin/dumpdbt.cpp.gcc43   2008-03-11 20:39:22.000000000 +0100
 471 +++ xbase-2.0.0/bin/dumpdbt.cpp 2008-03-11 20:40:31.000000000 +0100
 472 @@ -47,6 +47,9 @@
 473
 474  #include <xbase/xbase.h>
 475
 476 +using std::cout;
 477 +using std::endl;
 478 +
 479  int main( int ac, char **av )
 480  {
 481  #ifdef XB_MEMO_FIELDS
 482 diff -up xbase-2.0.0/bin/dbfxtrct.cpp.gcc43 xbase-2.0.0/bin/dbfxtrct.cpp
 483 --- xbase-2.0.0/bin/dbfxtrct.cpp.gcc43  2008-03-11 20:39:22.000000000 +0100
 484 +++ xbase-2.0.0/bin/dbfxtrct.cpp        2008-03-11 20:40:30.000000000 +0100
 485 @@ -47,6 +47,9 @@
 486
 487  #include "xbase/xbase.h"
 488
 489 +using std::cout;
 490 +using std::endl;
 491 +
 492  /*************************************************************************/
 493  void Usage();
 494  void Usage()
 495 diff -up xbase-2.0.0/bin/dbfutil1.cpp.gcc43 xbase-2.0.0/bin/dbfutil1.cpp
 496 --- xbase-2.0.0/bin/dbfutil1.cpp.gcc43  2008-03-11 20:39:22.000000000 +0100
 497 +++ xbase-2.0.0/bin/dbfutil1.cpp        2008-03-11 20:41:22.000000000 +0100
 498 @@ -42,6 +42,10 @@
 499
 500  #include <xbase/xbase.h>
 501
 502 +using std::cout;
 503 +using std::cin;
 504 +using std::endl;
 505 +
 506  xbXBase x;
 507  xbDbf d( &x );
 508  xbIndex *ix;
 509 diff -up xbase-2.0.0/libtest/indextst.cpp.gcc43 xbase-2.0.0/libtest/indextst.cpp
 510 --- xbase-2.0.0/libtest/indextst.cpp.gcc43      2008-03-11 20:41:46.000000000 +0100
 511 +++ xbase-2.0.0/libtest/indextst.cpp    2008-03-11 20:42:30.000000000 +0100
 512 @@ -31,6 +31,9 @@
 513
 514  #include <xbase/xbase.h>
 515
 516 +using std::cout;
 517 +using std::endl;
 518 +
 519  /* set the stack large for dos compiles */
 520  #ifdef __XBDOS
 521  #include <stdio.h>
 522 diff -up xbase-2.0.0/libtest/exptest.cpp.gcc43 xbase-2.0.0/libtest/exptest.cpp
 523 --- xbase-2.0.0/libtest/exptest.cpp.gcc43       2008-03-11 20:41:46.000000000 +0100
 524 +++ xbase-2.0.0/libtest/exptest.cpp     2008-03-11 20:42:30.000000000 +0100
 525 @@ -27,6 +27,9 @@
 526
 527  #include "xbase/xbase.h"
 528
 529 +using std::cout;
 530 +using std::endl;
 531 +
 532  class ExpTestor{
 533   public:
 534    ExpTestor( xbDbf * );
 535 diff -up xbase-2.0.0/libtest/locktest.cpp.gcc43 xbase-2.0.0/libtest/locktest.cpp
 536 --- xbase-2.0.0/libtest/locktest.cpp.gcc43      2008-03-11 20:41:46.000000000 +0100
 537 +++ xbase-2.0.0/libtest/locktest.cpp    2008-03-11 20:42:31.000000000 +0100
 538 @@ -7,6 +7,9 @@
 539  #include <stdlib.h>
 540  #include <stdio.h>
 541
 542 +using std::cout;
 543 +using std::endl;
 544 +
 545  int main(int, char**)
 546  {
 547  #if 0 // FIXME - seriously
 548 diff -up xbase-2.0.0/libtest/testdate.cpp.gcc43 xbase-2.0.0/libtest/testdate.cpp
 549 --- xbase-2.0.0/libtest/testdate.cpp.gcc43      2008-03-11 20:41:46.000000000 +0100
 550 +++ xbase-2.0.0/libtest/testdate.cpp    2008-03-11 20:42:32.000000000 +0100
 551 @@ -56,6 +56,9 @@
 552
 553  #include <xbase/xbase.h>
 554
 555 +using std::cout;
 556 +using std::endl;
 557 +
 558  int main()
 559  {
 560     xbString StringDate( "19601007" );      /* oct 7 1960 */
 561 diff -up xbase-2.0.0/libtest/testhtml.cpp.gcc43 xbase-2.0.0/libtest/testhtml.cpp
 562 --- xbase-2.0.0/libtest/testhtml.cpp.gcc43      2008-03-11 20:41:46.000000000 +0100
 563 +++ xbase-2.0.0/libtest/testhtml.cpp    2008-03-11 20:42:33.000000000 +0100
 564 @@ -48,6 +48,9 @@
 565
 566  #include <xbase/xbase.h>
 567
 568 +using std::cout;
 569 +using std::endl;
 570 +
 571  int main()
 572  {
 573  #ifdef XB_HTML