Revision 1864

trunk/src/linad99/fvar.hpp (revision 1864)
105 105

  
106 106
#define  MFCL2_CONSTRUCTORS
107 107

  
108
#if (defined(__GNUDOS__))
109
#   if (  (__GNUC__>3) || (__GNUC__==3 && __GNUC_MINOR__>=0)  )
110
#      define GCC3
111
#   endif
112
#endif
113

  
114 108
#if defined(_ADEXEP)
115 109
#   define USE_EXECPTIONS
116 110
#endif
......
367 361
#endif
368 362

  
369 363
#if ( (defined(__GNUC__) && (__GNUC__>=3))  \
370
    || (defined(_MSC_VER) && (_MSC_VER >= 1300))  \
371
    || (defined(__BORLANDC__) && (__BORLANDC__>=0x0570)  && defined(__linux__)) )
364
  || (defined(_MSC_VER) && (_MSC_VER >= 1300))  \
365
  || (defined(__BORLANDC__) && (__BORLANDC__>=0x0570) && defined(__linux__)))
372 366
#   include <iostream>
373 367
#   include <iomanip>
374 368
#   include <sstream>
trunk/src/linad99/dvect_io.cpp (revision 1864)
52 52
#ifdef __USE_IOSTREAM__
53 53
  int new_w = s.width();
54 54
  int new_p = s.precision();
55
#if defined(GCC3)
55
#if !defined(__cplusplus)
56 56
  ios::fmtflags new_form = s.flags();
57 57
#else
58 58
  long new_form = s.flags();
trunk/src/linad99/d3_io.cpp (revision 1864)
40 40
#ifdef __USE_IOSTREAM__
41 41
  int new_w = s.width();
42 42
  int new_p = s.precision();
43
#if defined(GCC3)
43
#if !defined(__cplusplus)
44
  long new_form = s.flags();
45
#else
44 46
  ios::fmtflags new_form = s.flags();
45
#else
46
  long new_form = s.flags();
47 47
#endif
48 48

  
49 49
  char new_fill = s.fill();
trunk/src/linad99/dmat_io.cpp (revision 1864)
51 51
#ifdef __USE_IOSTREAM__
52 52
  int new_w = s.width();
53 53
  int new_p = s.precision();
54
#if defined(GCC3)
54
#if !defined(__cplusplus)
55
  long new_form = s.flags();
56
#else
55 57
  ios::fmtflags new_form = s.flags();
56
#else
57
  long new_form = s.flags();
58 58
#endif
59 59
  char new_fill = s.fill();
60 60
#endif
trunk/src/linad99/fvara_io.cpp (revision 1864)
51 51
#ifdef __USE_IOSTREAM__
52 52
  std::streamsize new_w = s.width();
53 53
  std::streamsize new_p = s.precision();
54
#if defined(GCC3)
54
#if !defined(__cplusplus)
55
  long new_form = s.flags();
56
#else
55 57
  ios::fmtflags new_form = s.flags();
56
#else
57
  long new_form = s.flags();
58 58
#endif
59 59
  char new_fill = s.fill();
60 60
#endif
trunk/src/linad99/ivect_io.cpp (revision 1864)
45 45
#ifdef __USE_IOSTREAM__
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff