Changeset 2322 in Sophya for trunk/SophyaLib/BaseTools


Ignore:
Timestamp:
Feb 11, 2003, 4:31:10 PM (23 years ago)
Author:
cmv
Message:
  • passage xxstream.h en xxstream
  • compile avec gcc_3.2, gcc_2.96 et cxx En 3.2 le seek from ::end semble marcher (voir Eval/COS/pbseekios.cc)

rz+cmv 11/2/2003

Location:
trunk/SophyaLib/BaseTools
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaLib/BaseTools/complexios.h

    r268 r2322  
    88
    99#include "machdefs.h"
    10 #include <iostream.h>
     10#include <iostream>
    1111
    1212#if defined(NO_IOS_COMPLEX)

  • trunk/SophyaLib/BaseTools/dvlist.h

    r1310 r2322  
    99
    1010#include <stdio.h>
    11 #include <iostream.h>
     11#include <iostream>
    1212
    1313#include "mutyv.h"

  • trunk/SophyaLib/BaseTools/fiondblock.cc

    r1967 r2322  
    55#include <stdio.h>
    66#include <stdlib.h>
    7 #include <iostream.h>
     7#include <iostream>
    88#include <complex>
    99#include "pexceptions.h"

  • trunk/SophyaLib/BaseTools/fiondblock.h

    r802 r2322  
    1010#include "ppersist.h"
    1111#include "ndatablock.h"
    12 #include <iostream.h>
     12#include <iostream>
    1313
    1414namespace SOPHYA {

  • trunk/SophyaLib/BaseTools/machdefs_mkmf.h

    r1889 r2322  
    246246
    247247
     248/* (STREAMPOS_IS_CLASS non-active: ca compile sans sur gcc3.2 et cxx)
     249   rz+cmv 11/02/03 */
     250
    248251/* The following is true for most compilers */
    249252
    … …  
    275278#ifdef __GNUG__
    276279#define ANSI_TEMPLATES
    277 // #define GNU_TEMPLATES
     280/*
     281if (__GNUC__ >= 3)
     282define STREAMPOS_IS_CLASS
     283endif
     284*/
     285#define GNU_TEMPLATES
    278286#define HAS_STR_NPOS
    279287#define HAS_IOS_BIN
    … …  
    337345#endif
    338346
    339 #ifdef ANSI_IO
    340 #define seekg(p_, m_) rdbuf()->pubseekoff(p_,m_)
    341 #define seekp(p_, m_) rdbuf()->pubseekoff(p_,m_)
    342 #endif
     347/* Commente par Reza+CMV - Fev 2003
     348 ifdef ANSI_IO
     349 define seekg(p_, m_) rdbuf()->pubseekoff(p_,m_)
     350 define seekp(p_, m_) rdbuf()->pubseekoff(p_,m_)
     351 endif
     352*/
    343353
    344354#ifdef __MWERKS__
    … …  
    360370#define NO_VALUES_H
    361371#include "osx_values.h"
    362 /* Faute de mieux pour le moment : */
    363 #define drand48() ((double)(random())/LONG_MAX)
    364372#endif
    365373

  • trunk/SophyaLib/BaseTools/mutyv.cc

    r1607 r2322  
    77#include <stdio.h>
    88
    9 #include <iostream.h>
     9#include <iostream>
    1010#include <string.h>
    1111

  • trunk/SophyaLib/BaseTools/mutyv.h

    r1875 r2322  
    1010#include <string>
    1111#include <complex>
    12 #include <iostream.h>
     12#include <iostream>
    1313
    1414namespace SOPHYA {

  • trunk/SophyaLib/BaseTools/ndatablock.cc

    r1873 r2322  
    55#include <stdio.h>
    66#include <stdlib.h>
    7 #include <iostream.h>
     7#include <iostream>
    88#include <complex>
    99#include "pexceptions.h"

  • trunk/SophyaLib/BaseTools/ndatablock.h

    r1623 r2322  
    99#include <stdlib.h>        /* pour que size_t soit defini */
    1010#include "anydataobj.h"
    11 #include <iostream.h>
     11#include <iostream>
    1212
    1313namespace SOPHYA {

  • trunk/SophyaLib/BaseTools/pexceptions.cc

    r1960 r2322  
    11#include "pexceptions.h"
    2 #include <iostream.h>
     2#include <iostream>
    33#include <stdio.h>
    44

  • trunk/SophyaLib/BaseTools/ppersist.cc

    r2111 r2322  
    66#include "ppersist.h"
    77#include "anydataobj.h"
    8 #include <fstream.h>
    9 #include <iostream.h>
     8#include <fstream>
     9#include <iostream>
    1010#include <typeinfo>
    1111
    … …  
    478478
    479479  // Find tag entries at end of file
    480 #if (defined(Linux) || defined(Darwin)) &&  defined(__GNUG__)
     480#if (defined(Linux) || defined(Darwin)) &&  defined(__GNUG__) && (__GNUC__ < 3)
    481481  // There seems to be a bug where seekg with ios::end under Linux  with g++
    482482  // So, we use seek with ios::beg
Note: See TracChangeset for help on using the changeset viewer.