Macros Q_DECL_NOEXCEPT_EXPR don't work in gcc 4.6, so we couldn't compile
program for Ubuntu 12.04 with gcc 4.6. --HG-- branch : develop
This commit is contained in:
parent
ae222440a3
commit
fe2308fff8
|
@ -49,7 +49,7 @@ public:
|
||||||
* @param e exception
|
* @param e exception
|
||||||
*/
|
*/
|
||||||
VException(const VException &e):what(e.What()){}
|
VException(const VException &e):what(e.What()){}
|
||||||
virtual ~VException() Q_DECL_NOEXCEPT_EXPR(true){}
|
virtual ~VException() noexcept (true){}
|
||||||
/**
|
/**
|
||||||
* @brief raise method raise for exception
|
* @brief raise method raise for exception
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -57,7 +57,7 @@ public:
|
||||||
*/
|
*/
|
||||||
VExceptionBadId(const VExceptionBadId &e)
|
VExceptionBadId(const VExceptionBadId &e)
|
||||||
:VException(e), id(e.BadId()), key(e.BadKey()){}
|
:VException(e), id(e.BadId()), key(e.BadKey()){}
|
||||||
virtual ~VExceptionBadId() Q_DECL_NOEXCEPT_EXPR(true){}
|
virtual ~VExceptionBadId() noexcept (true){}
|
||||||
/**
|
/**
|
||||||
* @brief ErrorMessage return main error message
|
* @brief ErrorMessage return main error message
|
||||||
* @return main error message
|
* @return main error message
|
||||||
|
|
|
@ -49,7 +49,7 @@ public:
|
||||||
*/
|
*/
|
||||||
VExceptionConversionError(const VExceptionConversionError &e)
|
VExceptionConversionError(const VExceptionConversionError &e)
|
||||||
:VException(e), str(e.String()){}
|
:VException(e), str(e.String()){}
|
||||||
virtual ~VExceptionConversionError() Q_DECL_NOEXCEPT_EXPR(true) {}
|
virtual ~VExceptionConversionError() noexcept (true) {}
|
||||||
/**
|
/**
|
||||||
* @brief ErrorMessage return main error message
|
* @brief ErrorMessage return main error message
|
||||||
* @return main error message
|
* @return main error message
|
||||||
|
|
|
@ -53,7 +53,7 @@ public:
|
||||||
VExceptionEmptyParameter(const VExceptionEmptyParameter &e)
|
VExceptionEmptyParameter(const VExceptionEmptyParameter &e)
|
||||||
:VException(e), name(e.Name()), tagText(e.TagText()), tagName(e.TagName()),
|
:VException(e), name(e.Name()), tagText(e.TagText()), tagName(e.TagName()),
|
||||||
lineNumber(e.LineNumber()){}
|
lineNumber(e.LineNumber()){}
|
||||||
virtual ~VExceptionEmptyParameter() Q_DECL_NOEXCEPT_EXPR(true) {}
|
virtual ~VExceptionEmptyParameter() noexcept (true) {}
|
||||||
/**
|
/**
|
||||||
* @brief ErrorMessage return main error message
|
* @brief ErrorMessage return main error message
|
||||||
* @return main error message
|
* @return main error message
|
||||||
|
|
|
@ -52,7 +52,7 @@ public:
|
||||||
VExceptionObjectError(const VExceptionObjectError &e)
|
VExceptionObjectError(const VExceptionObjectError &e)
|
||||||
:VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()),
|
:VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()),
|
||||||
moreInfo(e.MoreInformation()){}
|
moreInfo(e.MoreInformation()){}
|
||||||
virtual ~VExceptionObjectError() Q_DECL_NOEXCEPT_EXPR(true) {}
|
virtual ~VExceptionObjectError() noexcept (true) {}
|
||||||
/**
|
/**
|
||||||
* @brief ErrorMessage return main error message
|
* @brief ErrorMessage return main error message
|
||||||
* @return main error message
|
* @return main error message
|
||||||
|
|
|
@ -51,7 +51,7 @@ public:
|
||||||
*/
|
*/
|
||||||
VExceptionUniqueId(const VExceptionUniqueId &e)
|
VExceptionUniqueId(const VExceptionUniqueId &e)
|
||||||
:VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){}
|
:VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){}
|
||||||
virtual ~VExceptionUniqueId() Q_DECL_NOEXCEPT_EXPR(true){}
|
virtual ~VExceptionUniqueId() noexcept (true){}
|
||||||
/**
|
/**
|
||||||
* @brief ErrorMessage return main error message
|
* @brief ErrorMessage return main error message
|
||||||
* @return main error message
|
* @return main error message
|
||||||
|
|
|
@ -51,7 +51,7 @@ public:
|
||||||
*/
|
*/
|
||||||
VExceptionWrongParameterId(const VExceptionWrongParameterId &e)
|
VExceptionWrongParameterId(const VExceptionWrongParameterId &e)
|
||||||
:VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){}
|
:VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){}
|
||||||
virtual ~VExceptionWrongParameterId() Q_DECL_NOEXCEPT_EXPR(true){}
|
virtual ~VExceptionWrongParameterId() noexcept (true){}
|
||||||
/**
|
/**
|
||||||
* @brief ErrorMessage return main error message
|
* @brief ErrorMessage return main error message
|
||||||
* @return main error message
|
* @return main error message
|
||||||
|
|
Loading…
Reference in New Issue
Block a user