[BACK]Return to cplx.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2018 / engine

Diff for /OpenXM_contrib2/asir2018/engine/cplx.c between version 1.2 and 1.3

version 1.2, 2019/04/26 00:46:49 version 1.3, 2019/06/04 07:11:23
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * 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 "ca.h"
 #include "base.h"  #include "base.h"
Line 57  Num *rp,*ip;
Line 57  Num *rp,*ip;
   if ( !a )    if ( !a )
     *rp = *ip = 0;      *rp = *ip = 0;
 #if defined(INTERVAL)  #if defined(INTERVAL)
   else if ( NID(a) <= N_PRE_C ) {    else if ( NID(a) < N_C ) {
 #else  #else
   else if ( NID(a) <= N_B ) {    else if ( NID(a) <= N_B ) {
 #endif  #endif
Line 91  Num *c;
Line 91  Num *c;
   else if ( !b )    else if ( !b )
     *c = a;      *c = a;
 #if defined(INTERVAL)  #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
   else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) )    else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) )
 #endif  #endif
Line 114  Num *c;
Line 114  Num *c;
   else if ( !b )    else if ( !b )
     *c = a;      *c = a;
 #if defined(INTERVAL)  #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
   else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) )    else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) )
 #endif  #endif
Line 135  Num *c;
Line 135  Num *c;
   if ( !a || !b )    if ( !a || !b )
     *c = 0;      *c = 0;
 #if defined(INTERVAL)  #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
   else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) )    else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) )
 #endif  #endif
Line 159  Num *c;
Line 159  Num *c;
   else if ( !a )    else if ( !a )
     *c = 0;      *c = 0;
 #if defined(INTERVAL)  #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
   else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) )    else if ( (NID(a) <= N_B) && (NID(b) <= N_B ) )
 #endif  #endif
Line 225  Num a,*c;
Line 225  Num a,*c;
   if ( !a )    if ( !a )
     *c = 0;      *c = 0;
 #if defined(INTERVAL)  #if defined(INTERVAL)
   else if ( NID(a) <= N_PRE_C )    else if ( NID(a) < N_C )
 #else  #else
   else if ( NID(a) <= N_B )    else if ( NID(a) <= N_B )
 #endif  #endif
Line 244  Num a,b;
Line 244  Num a,b;
   
   if ( !a ) {    if ( !a ) {
 #if defined(INTERVAL)  #if defined(INTERVAL)
     if ( !b || (NID(b)<=N_PRE_C) )      if ( !b || (NID(b)<N_C) )
 #else  #else
     if ( !b || (NID(b)<=N_B) )      if ( !b || (NID(b)<=N_B) )
 #endif  #endif
Line 253  Num a,b;
Line 253  Num a,b;
       return -1;        return -1;
   } else if ( !b ) {    } else if ( !b ) {
 #if defined(INTERVAL)  #if defined(INTERVAL)
     if ( !a || (NID(a)<=N_PRE_C) )      if ( !a || (NID(a)<N_C) )
 #else  #else
     if ( !a || (NID(a)<=N_B) )      if ( !a || (NID(a)<=N_B) )
 #endif  #endif
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>