Update of /cvsroot/objecthandler/ObjectHandler/ohxl/Conversions
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19440/ohxl/Conversions
Modified Files:
opertovector.hpp
Log Message:
Index: opertovector.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/Conversions/opertovector.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** opertovector.hpp 2 Jan 2007 14:47:50 -0000 1.3
--- opertovector.hpp 3 Jan 2007 17:43:14 -0000 1.4
***************
*** 29,37 ****
bool needToFree = false;
try {
- std::vector<T> ret;
if (xVector.xltype & xltypeErr)
throw Exception("input value has type=error");
if (xVector.xltype & (xltypeMissing | xltypeNil))
! return ret;
const OPER *xMulti;
--- 29,36 ----
bool needToFree = false;
try {
if (xVector.xltype & xltypeErr)
throw Exception("input value has type=error");
if (xVector.xltype & (xltypeMissing | xltypeNil))
! return std::vector<T>();
const OPER *xMulti;
***************
*** 45,50 ****
}
ret.reserve(xMulti->val.array.rows * xMulti->val.array.columns);
! for (int i=0; i<xMulti->val.array.rows * xMulti->val.array.columns; i++) {
T value;
operToScalar(value, xMulti->val.array.lparray[i]);
--- 44,50 ----
}
+ std::vector<T> ret;
ret.reserve(xMulti->val.array.rows * xMulti->val.array.columns);
! for (int i=0; i<xMulti->val.array.rows * xMulti->val.array.columns; ++i) {
T value;
operToScalar(value, xMulti->val.array.lparray[i]);
***************
*** 65,68 ****
--- 65,69 ----
}
+ //NANDO what are FP?
template <class T>
std::vector<T> fpToVector(const FP &fpVector) {
|
