SCM

SCM Repository

[matrix] Diff of /pkg/Matrix/src/Csparse.c
ViewVC logotype

Diff of /pkg/Matrix/src/Csparse.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2515, Wed Jan 27 19:08:13 2010 UTC revision 2516, Mon Feb 1 13:27:27 2010 UTC
# Line 371  Line 371 
371  #ifdef AS_CHM_DIAGU2N_FIXED_FINALLY  #ifdef AS_CHM_DIAGU2N_FIXED_FINALLY
372      CHM_TR cht = trip ? AS_CHM_TR(x) : (CHM_TR) NULL;      CHM_TR cht = trip ? AS_CHM_TR(x) : (CHM_TR) NULL;
373  #else /* workaround needed:*/  #else /* workaround needed:*/
374      CHM_TR cht = trip ? AS_CHM_TR__(Tsparse_diagU2N(x)) : (CHM_TR) NULL;      SEXP xx = PROTECT(Tsparse_diagU2N(x));
375        CHM_TR cht = trip ? AS_CHM_TR__(xx) : (CHM_TR) NULL;
376  #endif  #endif
377      CHM_SP chcp, chxt,      CHM_SP chcp, chxt,
378          chx = (trip ?          chx = (trip ?
# Line 394  Line 395 
395                     duplicate(VECTOR_ELT(GET_SLOT(x, Matrix_DimNamesSym),                     duplicate(VECTOR_ELT(GET_SLOT(x, Matrix_DimNamesSym),
396                                          (tr) ? 0 : 1)));                                          (tr) ? 0 : 1)));
397      SET_VECTOR_ELT(dn, 1, duplicate(VECTOR_ELT(dn, 0)));      SET_VECTOR_ELT(dn, 1, duplicate(VECTOR_ELT(dn, 0)));
398    #ifdef AS_CHM_DIAGU2N_FIXED_FINALLY
399      UNPROTECT(1);      UNPROTECT(1);
400    #else
401        UNPROTECT(2);
402    #endif
403      return chm_sparse_to_SEXP(chcp, 1, 0, 0, "", dn);      return chm_sparse_to_SEXP(chcp, 1, 0, 0, "", dn);
404  }  }
405    

Legend:
Removed from v.2515  
changed lines
  Added in v.2516

root@r-forge.r-project.org
ViewVC Help
Powered by ViewVC 1.0.0  
Thanks to:
Vienna University of Economics and Business University of Wisconsin - Madison Powered By FusionForge