From eddc01b445ccc15a3046068ae84fa4d483387dec Mon Sep 17 00:00:00 2001 From: kevin Date: Tue, 18 Nov 2014 16:57:44 -0800 Subject: [PATCH] vop/cmVectOpsTemplateCode/Hdr.h Changed fieldWidth and decPlCnt from unsigned to int in PrintF() Added #ifdef OS_OSX conditional compile around ilaenv_() in LUInverse(). --- vop/cmVectOpsTemplateCode.h | 8 ++++++-- vop/cmVectOpsTemplateHdr.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/vop/cmVectOpsTemplateCode.h b/vop/cmVectOpsTemplateCode.h index e160766..a0fa2fa 100644 --- a/vop/cmVectOpsTemplateCode.h +++ b/vop/cmVectOpsTemplateCode.h @@ -13,7 +13,7 @@ void VECT_OP_FUNC(VPrint)( cmRpt_t* rpt, const char* fmt, ... ) 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 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 - // 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' +#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 ); - +#endif + VECT_OP_TYPE w[drn * nb]; // allocate working memory int_lap_t info; diff --git a/vop/cmVectOpsTemplateHdr.h b/vop/cmVectOpsTemplateHdr.h index 1069d00..f491b0c 100644 --- a/vop/cmVectOpsTemplateHdr.h +++ b/vop/cmVectOpsTemplateHdr.h @@ -2,7 +2,7 @@ /// Vector operations interface. /// 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(PrintE)( cmRpt_t* rpt, unsigned rn, unsigned cn, const VECT_OP_TYPE* dbp );