[ObjectHandler-cvs] ObjectHandler/ohxl/Conversions opertomatrix.hpp, 1.5, 1.6 opertoscalar.hpp, 1.3, 1.4

[Ferdinando A. <na...@us...>]

Update of /cvsroot/objecthandler/ObjectHandler/ohxl/Conversions
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18628/ohxl/Conversions

Modified Files:
	opertomatrix.hpp opertoscalar.hpp 
Log Message:


Index: opertoscalar.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/Conversions/opertoscalar.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** opertoscalar.hpp	20 Nov 2006 17:41:57 -0000	1.3
--- opertoscalar.hpp	3 Jan 2007 17:42:02 -0000	1.4
***************
*** 25,28 ****
--- 25,29 ----
  namespace ObjHandler {
  
+     //NANDO why are these returning void?
      DLL_API void operToScalar(long &ret, const OPER &xScalar);
      DLL_API void operToScalar(double &ret, const OPER &xScalar);
***************
*** 32,37 ****
      template <class T>
      T operToScalar(const OPER &xScalar, 
!             const T &defaultValue, 
!             const std::string paramName) {
          if ((xScalar.xltype & xltypeMissing)
          || ((xScalar.xltype & xltypeErr) && (xScalar.val.err == xlerrNA)))
--- 33,38 ----
      template <class T>
      T operToScalar(const OPER &xScalar, 
!                    const T &defaultValue, 
!                    const std::string paramName) {
          if ((xScalar.xltype & xltypeMissing)
          || ((xScalar.xltype & xltypeErr) && (xScalar.val.err == xlerrNA)))

Index: opertomatrix.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/Conversions/opertomatrix.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** opertomatrix.hpp	3 Jan 2007 14:24:30 -0000	1.5
--- opertomatrix.hpp	3 Jan 2007 17:42:02 -0000	1.6
***************
*** 29,37 ****
          bool needToFree = false;
          try {
-             std::vector<std::vector<T> > ret;
              if (xMatrix.xltype & xltypeErr)
                  throw Exception("input value has type=error");
              if (xMatrix.xltype & (xltypeMissing | xltypeNil))
!                 return ret;
  
              const OPER *xMulti;
--- 29,36 ----
          bool needToFree = false;
          try {
              if (xMatrix.xltype & xltypeErr)
                  throw Exception("input value has type=error");
              if (xMatrix.xltype & (xltypeMissing | xltypeNil))
!                 return std::vector<std::vector<T> >();
  
              const OPER *xMulti;
***************
*** 45,48 ****
--- 44,48 ----
              }
  
+             std::vector<std::vector<T> > ret;
              ret.reserve(xMulti->val.array.rows);
              for (int i=0; i<xMulti->val.array.rows; ++i) {