1,58c1,53
< #ifndef _INVALID_DATA_EXCEPTION_H
< #define _INVALID_DATA_EXCEPTION_H
< 
< //#include <stdexcept>
< #include <string>
< #include <sstream> // ostringstream
< 
< #include "FileException.h"
< //#include "FssimApp.h"
< 
< using namespace std;
< 
< // defines the type of exception thrown by the File class
< // member functions: Open, Read, & Write
< class InvalidDataException : public FileException
< {
< public:
< 	InvalidDataException(const double invalidValue, const string& what, const bool isFatal = true)
< 	    : FileException(what, false, isFatal)
< 	{
<         // added in v4.1
<         //this->initLineNumberAndFileName();
<         ostringstream message;
<         message << FileException::what() << "(" << invalidValue << ")";
<         m_what = message.str();
<     }
< 
< 	InvalidDataException(const string& invalidValue, const string& what, const bool isFatal = true)
< 	    : FileException(what, false, isFatal)
< 	{
< 	// added in v4.1
<         //this->initLineNumberAndFileName();
<         ostringstream message;
<         message << FileException::what() << "(" << invalidValue << ")";
<         m_what = message.str();
<     }
< 
< 	virtual ~InvalidDataException() throw() { }
< 
<     // override to provide invalid value with message
< 	virtual const char* what() const throw()
< 	{
< 	    return m_what.c_str();
< 	}
< 
< protected:
<     void setWhat(const string& what, const string& invalidValue)
<     {
<         ostringstream message;
<         message << FileException::what() << what << "(" << invalidValue << ")";
<         m_what = message.str();
<     }
< 
< private:
<     string m_what;
< };
< 
< #endif
---
> #ifndef _INVALID_DATA_EXCEPTION_H
> #define _INVALID_DATA_EXCEPTION_H
> 
> #include <string>
> #include <sstream> // ostringstream
> 
> #include "FileException.h"
> 
> using namespace std;
> 
> 
> class InvalidDataException : public FileException
> {
> public:
> 	InvalidDataException(const double invalidValue, const string& what, const bool isFatal = true)
> 	    : FileException(what, false, isFatal)
> 	{
>         this->initLineNumberAndFileName();
>         ostringstream message;
>         message << FileException::what() << "(" << invalidValue << ")";
>         m_what = message.str();
>     }
> 
> 	InvalidDataException(const string& invalidValue, const string& what, const bool isFatal = true)
> 	    : FileException(what, false, isFatal)
> 	{
>         this->initLineNumberAndFileName();
>         ostringstream message;
>         message << FileException::what() << "(" << invalidValue << ")";
>         m_what = message.str();
>     }
> 
> 	virtual ~InvalidDataException() throw() { }
> 
>     // override to provide invalid value with message
> 	virtual const char* what() const throw()
> 	{
> 	    return m_what.c_str();
> 	}
> 
> protected:
>     void setWhat(const string& what, const string& invalidValue)
>     {
>         ostringstream message;
>         message << FileException::what() << what << "(" << invalidValue << ")";
>         m_what = message.str();
>     }
> 
> private:
>     string m_what;
> };
> 
> #endif