cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vop/cmVectOpsTemplateCode/Hdr.h

Browse Source 
Changed fieldWidth and decPlCnt from unsigned to int in PrintF()
Added #ifdef OS_OSX conditional compile around ilaenv_() in LUInverse().
This commit is contained in:
kevin 2014-11-18 16:57:44 -08:00
parent 1931bfdd6d
commit eddc01b445
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vop/cmVectOpsTemplateCode.h
View File

@ -13,7 +13,7 @@ void VECT_OP_FUNC(VPrint)( cmRpt_t* rpt, const char* fmt, ... )
va_end(vl); va_end(vl);
} }
void VECT_OP_FUNC(Printf)( cmRpt_t* rpt, unsigned rowCnt, unsigned colCnt, const VECT_OP_TYPE* sbp, unsigned fieldWidth, unsigned decPlCnt, const char* fmt, unsigned flags ) void VECT_OP_FUNC(Printf)( cmRpt_t* rpt, unsigned rowCnt, unsigned colCnt, const VECT_OP_TYPE* sbp, int fieldWidth, int decPlCnt, const char* fmt, unsigned flags )
{ {
unsigned cci; unsigned cci;
unsigned outColCnt = 10; unsigned outColCnt = 10;
@ -1287,8 +1287,12 @@ VECT_OP_TYPE* VECT_OP_FUNC(LUInverse)(VECT_OP_TYPE* dp, int_lap_t* ipiv, int drn
// Calculate the NB factor for LWORK - // Calculate the NB factor for LWORK -
// The two args are length of string args 'funcNameStr' and ' '. // The two args are length of string args 'funcNameStr' and ' '.
// It is not clear how many 'n' args are requred so all are passed set to 'drn' // It is not clear how many 'n' args are requred so all are passed set to 'drn'
#ifdef OS_OSX
int nb = ilaenv_(&ispec, funcNameStr, " ", &n1,&n2,&n3,&n4 );
#else
int nb = ilaenv_(&ispec, funcNameStr, " ", &n1,&n2,&n3,&n4, strlen(funcNameStr), 1 ); int nb = ilaenv_(&ispec, funcNameStr, " ", &n1,&n2,&n3,&n4, strlen(funcNameStr), 1 );
#endif
VECT_OP_TYPE w[drn * nb]; // allocate working memory VECT_OP_TYPE w[drn * nb]; // allocate working memory
int_lap_t info; int_lap_t info;

2
vop/cmVectOpsTemplateHdr.h
View File

@ -2,7 +2,7 @@
/// Vector operations interface. /// Vector operations interface.
/// Setting fieldWidth or decPltCnt to to negative values result in fieldWidth == 10 or decPlCnt == 4 /// Setting fieldWidth or decPltCnt to to negative values result in fieldWidth == 10 or decPlCnt == 4
void VECT_OP_FUNC(Printf)( cmRpt_t* rpt, unsigned rn, unsigned cn, const VECT_OP_TYPE* dbp, unsigned fieldWidth, unsigned decPlCnt, const char* fmt, unsigned flags ); void VECT_OP_FUNC(Printf)( cmRpt_t* rpt, unsigned rn, unsigned cn, const VECT_OP_TYPE* dbp, int fieldWidth, int decPlCnt, const char* fmt, unsigned flags );
void VECT_OP_FUNC(Print)( cmRpt_t* rpt, unsigned rn, unsigned cn, const VECT_OP_TYPE* dbp ); void VECT_OP_FUNC(Print)( cmRpt_t* rpt, unsigned rn, unsigned cn, const VECT_OP_TYPE* dbp );
void VECT_OP_FUNC(PrintE)( cmRpt_t* rpt, unsigned rn, unsigned cn, const VECT_OP_TYPE* dbp ); void VECT_OP_FUNC(PrintE)( cmRpt_t* rpt, unsigned rn, unsigned cn, const VECT_OP_TYPE* dbp );