Update of /cvsroot/objecthandler/ObjectHandler/ohxl/Conversions
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11764/ohxl/Conversions
Modified Files:
opertoscalar.hpp
Log Message:
use default value if input is #NA
Index: opertoscalar.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/Conversions/opertoscalar.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** opertoscalar.hpp 19 Nov 2006 13:08:27 -0000 1.2
--- opertoscalar.hpp 20 Nov 2006 17:41:57 -0000 1.3
***************
*** 34,38 ****
const T &defaultValue,
const std::string paramName) {
! if (xScalar.xltype & xltypeMissing)
return defaultValue;
try {
--- 34,39 ----
const T &defaultValue,
const std::string paramName) {
! if ((xScalar.xltype & xltypeMissing)
! || ((xScalar.xltype & xltypeErr) && (xScalar.val.err == xlerrNA)))
return defaultValue;
try {
|
