Changeset 3525 in Sophya for trunk/SophyaLib/BaseTools


Ignore:
Timestamp:
Oct 12, 2008, 6:51:34 PM (17 years ago)
Author:
ansari
Message:

Suppression des flags OS_xxx (OS_MACOSX OS_AIX ...) de machdefs.h et ajout constructeur MuTyV(uint_4, uint_8) - Reza 12/10/2008

Location:
trunk/SophyaLib/BaseTools
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaLib/BaseTools/machdefs_mkmf.h

    r3240 r3525  
    2020#if defined(OSF1)
    2121#define MACH_ALPHA
    22 #define OS_OSF1
    2322#endif
    2423
    … …  
    3029#if defined(__hpux__) || defined(HPUX)
    3130#define MACH_HP
    32 #define OS_HPUX
    3331#endif
    3432
    3533#if defined(SunOS)  || defined ( sun )
    3634#define MACH_SUN
    37 #define OS_SOLARIS
    3835#endif
    3936
    4037#ifdef IRIX64
    4138#define MACH_SGI
    42 #define OS_IRIX64
    4339#endif
    4440
    … …  
    5046#define MACH_INTEL
    5147#endif
    52 #define OS_MACOSX
    5348#endif
    5449#endif
    … …  
    6661   determiner correctement le type de  processeur        */
    6762#endif
    68 #define OS_LINUX
    6963#endif
    7064
    … …  
    270264
    271265
    272 #ifdef OS_MACOSX
     266#ifdef Darwin
    273267#define NO_VALUES_H
    274268#include "osx_values.h"

  • trunk/SophyaLib/BaseTools/mutyv.h

    r2926 r3525  
    3333         MuTyV(MuTyV const & a);
    3434  inline MuTyV(uint_2 i) { typ = MTVInteger; iv = (int_8)i;  dv = (r_8)i;  dv_im = 0.;  strv = NULL; }
     35  inline MuTyV(uint_4 i) { typ = MTVInteger; iv = (int_8)i;  dv = (r_8)i;  dv_im = 0.;  strv = NULL; }
    3536  inline MuTyV(uint_8 i) { typ = MTVInteger; iv = (int_8)i;  dv = (r_8)i;  dv_im = 0.;  strv = NULL; }
     37  inline MuTyV(int_2 i)  { typ = MTVInteger; iv = (int_8)i;  dv = (r_8)i;  dv_im = 0.;  strv = NULL; }
    3638  inline MuTyV(int_4 i)  { typ = MTVInteger; iv = (int_8)i;  dv = (r_8)i;  dv_im = 0.;  strv = NULL; }
    3739  inline MuTyV(int_8 i)  { typ = MTVInteger; iv = i;  dv = (r_8)i;  dv_im = 0.;  strv = NULL; }

  • trunk/SophyaLib/BaseTools/ppfbinstream.cc

    r2805 r3525  
    1010
    1111//  strptime n'est pas defini sous Linux avec g++ avant gcc 3.x - Reza Mars 2000
    12 #if defined(OS_LINUX) && defined(__GNUG__) && (__GNUC__ < 3)
     12#if defined(Linux) && defined(__GNUG__) && (__GNUC__ < 3)
    1313extern "C" {
    1414char *strptime(const char *buf, const char *format, struct tm *tm);
Note: See TracChangeset for help on using the changeset viewer.