From 851b5896c04ce384766887498045d084724182cb Mon Sep 17 00:00:00 2001 From: ferhat Date: Fri, 30 Jan 2009 11:04:21 +0000 Subject: [PATCH] correction of the constants returned by functions ReadNum and ReadAlpha in the SimpleEleme virtual class git-svn-id: https://www.dynare.org/svn/dynare/trunk@2384 ac1d8469-bf42-47a9-8791-bf33cf982152 --- preprocessor/include/MatlabFile.hh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/preprocessor/include/MatlabFile.hh b/preprocessor/include/MatlabFile.hh index fcc15d77b..5380f2daf 100644 --- a/preprocessor/include/MatlabFile.hh +++ b/preprocessor/include/MatlabFile.hh @@ -185,7 +185,7 @@ class UTF8 : public SimpleElem { public: virtual int size() const {return(1);}; - virtual double ReadNum(char* InBuff, int* pBuff) const {return(NULL);}; + virtual double ReadNum(char* InBuff, int* pBuff) const {return(0.0);}; virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const; }; @@ -193,7 +193,7 @@ class UTF16 : public SimpleElem { public: virtual int size() const {return(2);}; - virtual double ReadNum(char* InBuff, int* pBuff) const {return(NULL);}; + virtual double ReadNum(char* InBuff, int* pBuff) const {return(0.0);}; virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const; }; @@ -201,7 +201,7 @@ class UTF32 : public SimpleElem { public: virtual int size() const {return(4);}; - virtual double ReadNum(char* InBuff, int* pBuff) const {return(NULL);}; + virtual double ReadNum(char* InBuff, int* pBuff) const {return(0.0);}; virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const; }; @@ -210,7 +210,7 @@ class INT8 : public SimpleElem public: virtual int size() const {return(1);}; virtual double ReadNum(char* InBuff, int* pBuff) const; - virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const {return(NULL);}; + virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const {return(string(""));}; }; class INT16 : public SimpleElem @@ -218,7 +218,7 @@ class INT16 : public SimpleElem public: virtual int size() const {return(2);}; virtual double ReadNum(char* InBuff, int* pBuff) const; - virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const {return(NULL);}; + virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const {return(string(""));}; }; @@ -227,7 +227,7 @@ class INT32 : public SimpleElem public: virtual int size() const {return(4);}; virtual double ReadNum(char* InBuff, int* pBuff) const; - virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const {return(NULL);}; + virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const {return(string(""));}; }; @@ -236,7 +236,7 @@ class INT64 : public SimpleElem public: virtual int size() const {return(8);}; virtual double ReadNum(char* InBuff, int* pBuff) const; - virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const {return(NULL);}; + virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const {return(string(""));}; }; @@ -245,7 +245,7 @@ class Single : public SimpleElem public: virtual int size() const {return(4);}; virtual double ReadNum(char* InBuff, int* pBuff) const; - virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const {return(NULL);}; + virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const {return(string(""));}; }; @@ -254,7 +254,7 @@ class Double : public SimpleElem public: virtual int size() const {return(8);}; virtual double ReadNum(char* InBuff, int* pBuff) const; - virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const {return(NULL);}; + virtual string ReadAlph(char* InBuff, int* pBuff, int Size) const {return(string(""));}; }; //! Base class for Array Element in Mat-File