Changeset 20405


Ignore:
Timestamp:
03/31/16 10:39:10 (9 years ago)
Author:
Mathieu Morlighem
Message:

CHG: no need to define INFINITY and NAN in windows

Location:
issm/trunk-jpl/src/c
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Makefile.am

    r20386 r20405  
    268268#DAKOTA sources  {{{
    269269if DAKOTA
    270 issm_sources +=       ./classes/Dakota/IssmDirectApplicInterface.h\
     270issm_sources +=  ./classes/Dakota/IssmDirectApplicInterface.h\
    271271                                          ./classes/Dakota/IssmParallelDirectApplicInterface.cpp\
    272272                                          ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\

  • issm/trunk-jpl/src/c/shared/Numerics/constants.h

    r20383 r20405  
    1717#define NDOF4 4
    1818
    19 #define DIM2 2
    20 #define DIM3 3
    21 
    22 /*Windows specific typefefs: */
    23 #ifdef _INTEL_WIN_
    24 
    25 #ifndef NAN
    26 //For reference, for Intel compile on win64
    27 //#define NAN 0.0/0.0
    28 #define NAN (INFINITY-INFINITY)
    29 #endif
    30 
    31 #ifndef INFINITY
    32 //For reference, for Intel compile on win64
    33 //#define INFINITY 1.0/0.0
    34 #define INFINITY (DBL_MAX+DBL_MAX)
    35 #endif
    36 
    37 #endif /*_INTEL_WIN_*/
     19// /*Windows specific typefefs: */
     20// #ifdef _INTEL_WIN_
     21//
     22// #ifndef NAN
     23// //For reference, for Intel compile on win64
     24// //#define NAN 0.0/0.0
     25// #define NAN (INFINITY-INFINITY)
     26// #endif
     27//
     28// #ifndef INFINITY
     29// //For reference, for Intel compile on win64
     30// //#define INFINITY 1.0/0.0
     31// #define INFINITY (DBL_MAX+DBL_MAX)
     32// #endif
     33//
     34// #endif /*_INTEL_WIN_*/
    3835
    3936#endif /*_ISSM_CONSTANTS_H_*/
Note: See TracChangeset for help on using the changeset viewer.