Fix infinity testcase on windows

This commit is contained in:
William S Fulton 2014-05-29 07:50:21 +01:00
commit 664c6cc81e
2 changed files with 21 additions and 7 deletions

View file

@ -10,15 +10,16 @@
#include <math.h> #include <math.h>
/* C99 math.h defines INFINITY. If not available, this is the fallback. */ /* C99 math.h defines INFINITY. If not available, this is the fallback. */
#ifndef INFINITY #if !defined(INFINITY)
#ifdef _MSC_VER #if defined(_MSC_VER)
union MSVC_EVIL_FLOAT_HACK union MSVC_EVIL_FLOAT_HACK
{ {
unsigned __int8 Bytes[4]; unsigned __int8 Bytes[4];
float Value; float Value;
}; };
static union MSVC_EVIL_FLOAT_HACK INFINITY_HACK = {{0x00, 0x00, 0x80, 0x7F}}; const union MSVC_EVIL_FLOAT_HACK INFINITY_HACK = {{0x00, 0x00, 0x80, 0x7F}};
#define INFINITY (INFINITY_HACK.Value) #define INFINITY (INFINITY_HACK.Value)
#define INFINITY_NO_CONST
#endif #endif
#ifdef __GNUC__ #ifdef __GNUC__
@ -33,15 +34,27 @@
#define INFINITY (1e1000) #define INFINITY (1e1000)
#endif #endif
#endif #endif
%}
%inline %{ #ifdef INFINITY_NO_CONST
/* This will allow us to bind the real INFINITY value through SWIG via MYINFINITY. Use %rename to fix the name. */ /* To void: error C2099: initializer is not a constant */
double MYINFINITY = 0.0;
void initialise_MYINFINITY(void) {
MYINFINITY = INFINITY;
}
#else
const double MYINFINITY = INFINITY; const double MYINFINITY = INFINITY;
void initialise_MYINFINITY(void) {
}
#endif
/* Use of float is intentional because the original bug was in the float conversion due to overflow checking. */
float use_infinity(float inf_val) float use_infinity(float inf_val)
{ {
return inf_val; return inf_val;
} }
%} %}
/* This will allow us to bind the real INFINITY value through SWIG via MYINFINITY. Use %rename to fix the name. */
const double MYINFINITY = INFINITY;
/* Use of float is intentional because the original bug was in the float conversion due to overflow checking. */
float use_infinity(float inf_val);

View file

@ -1,4 +1,5 @@
var infinity = require("infinity"); var infinity = require("infinity");
infinity.initialise_MYINFINITY();
var my_infinity = infinity.INFINITY; var my_infinity = infinity.INFINITY;
var ret_val = infinity.use_infinity(my_infinity); var ret_val = infinity.use_infinity(my_infinity);