=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2018/engine/cplx.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- OpenXM_contrib2/asir2018/engine/cplx.c 2019/04/26 00:46:49 1.2 +++ OpenXM_contrib2/asir2018/engine/cplx.c 2019/06/04 07:11:23 1.3 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2018/engine/cplx.c,v 1.1 2018/09/19 05:45:07 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2018/engine/cplx.c,v 1.2 2019/04/26 00:46:49 noro Exp $ */ #include "ca.h" #include "base.h" @@ -57,7 +57,7 @@ Num *rp,*ip; if ( !a ) *rp = *ip = 0; #if defined(INTERVAL) - else if ( NID(a) <= N_PRE_C ) { + else if ( NID(a) < N_C ) { #else else if ( NID(a) <= N_B ) { #endif @@ -91,7 +91,7 @@ Num *c; else if ( !b ) *c = a; #if defined(INTERVAL) - else if ( (NID(a) <= N_PRE_C) && (NID(b) <= N_PRE_C ) ) + else if ( (NID(a) < N_C) && (NID(b) < N_C ) ) #else else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) ) #endif @@ -114,7 +114,7 @@ Num *c; else if ( !b ) *c = a; #if defined(INTERVAL) - else if ( (NID(a) <= N_PRE_C) && (NID(b) <= N_PRE_C ) ) + else if ( (NID(a) < N_C) && (NID(b) <= N_C ) ) #else else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) ) #endif @@ -135,7 +135,7 @@ Num *c; if ( !a || !b ) *c = 0; #if defined(INTERVAL) - else if ( (NID(a) <= N_PRE_C) && (NID(b) <= N_PRE_C ) ) + else if ( (NID(a) < N_C) && (NID(b) < N_C ) ) #else else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) ) #endif @@ -159,7 +159,7 @@ Num *c; else if ( !a ) *c = 0; #if defined(INTERVAL) - else if ( (NID(a) <= N_PRE_C) && (NID(b) <= N_PRE_C ) ) + else if ( (NID(a) < N_C) && (NID(b) < N_C ) ) #else else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) ) #endif @@ -225,7 +225,7 @@ Num a,*c; if ( !a ) *c = 0; #if defined(INTERVAL) - else if ( NID(a) <= N_PRE_C ) + else if ( NID(a) < N_C ) #else else if ( NID(a) <= N_B ) #endif @@ -244,7 +244,7 @@ Num a,b; if ( !a ) { #if defined(INTERVAL) - if ( !b || (NID(b)<=N_PRE_C) ) + if ( !b || (NID(b)