Browse Source

vop/cmVectOpsTemplateCode/Hdr.h

Changed fieldWidth and decPlCnt from unsigned to int in PrintF()
Added #ifdef OS_OSX conditional compile around ilaenv_() in LUInverse().
master
kevin 10 years ago
parent
commit
eddc01b445
2 changed files with 7 additions and 3 deletions
  1. 6
    2
      vop/cmVectOpsTemplateCode.h
  2. 1
    1
      vop/cmVectOpsTemplateHdr.h

+ 6
- 2
vop/cmVectOpsTemplateCode.h View File

@@ -13,7 +13,7 @@ void          VECT_OP_FUNC(VPrint)( cmRpt_t* rpt, const char* fmt, ... )
13 13
   va_end(vl);
14 14
 }
15 15
 
16
-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 )
16
+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 )
17 17
 {
18 18
   unsigned cci;
19 19
   unsigned outColCnt = 10;
@@ -1287,8 +1287,12 @@ VECT_OP_TYPE* VECT_OP_FUNC(LUInverse)(VECT_OP_TYPE* dp, int_lap_t* ipiv, int drn
1287 1287
   // Calculate the NB factor for LWORK - 
1288 1288
   // The two args are length of string args 'funcNameStr' and ' '.
1289 1289
   // It is not clear how many 'n' args are requred so all are passed set to 'drn'
1290
+#ifdef OS_OSX
1291
+   int nb = ilaenv_(&ispec, funcNameStr, " ", &n1,&n2,&n3,&n4 );
1292
+#else
1290 1293
   int nb = ilaenv_(&ispec, funcNameStr, " ", &n1,&n2,&n3,&n4, strlen(funcNameStr), 1 );
1291
-
1294
+#endif
1295
+  
1292 1296
   VECT_OP_TYPE w[drn * nb];    // allocate working memory
1293 1297
   int_lap_t    info;
1294 1298
 

+ 1
- 1
vop/cmVectOpsTemplateHdr.h View File

@@ -2,7 +2,7 @@
2 2
 /// Vector operations interface.
3 3
 
4 4
 /// Setting fieldWidth or decPltCnt to to negative values result in fieldWidth == 10 or decPlCnt == 4
5
-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 );
5
+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 );
6 6
 void          VECT_OP_FUNC(Print)(  cmRpt_t* rpt, unsigned rn, unsigned cn, const VECT_OP_TYPE* dbp );
7 7
 void          VECT_OP_FUNC(PrintE)( cmRpt_t* rpt, unsigned rn, unsigned cn, const VECT_OP_TYPE* dbp );
8 8
 

Loading…
Cancel
Save