diff --git a/tests/3rdparty/testngpp/include/testngpp/internal/Error.h b/tests/3rdparty/testngpp/include/testngpp/internal/Error.h index 0770c01..f549b54 100644 --- a/tests/3rdparty/testngpp/include/testngpp/internal/Error.h +++ b/tests/3rdparty/testngpp/include/testngpp/internal/Error.h @@ -33,7 +33,7 @@ struct Error : public std::exception {} ~Error() TESTNGPP_THROW() {} - const char* what() const TESTNGPP_THROW() + const char* what() const throw() { return reason.c_str(); } diff --git a/tests/3rdparty/testngpp/include/testngpp/internal/Exception.h b/tests/3rdparty/testngpp/include/testngpp/internal/Exception.h index b7fd69a..d647d20 100644 --- a/tests/3rdparty/testngpp/include/testngpp/internal/Exception.h +++ b/tests/3rdparty/testngpp/include/testngpp/internal/Exception.h @@ -34,7 +34,7 @@ struct Exception: public std::exception const std::string& getFileName() const; unsigned int getLineOfFile() const; - const char* what() const TESTNGPP_THROW(); + const char* what() const throw(); private: std::string fileName; diff --git a/tests/3rdparty/testngpp/include/testngpp/testngpp.h b/tests/3rdparty/testngpp/include/testngpp/testngpp.h index 158dc17..7fdac37 100644 --- a/tests/3rdparty/testngpp/include/testngpp/testngpp.h +++ b/tests/3rdparty/testngpp/include/testngpp/testngpp.h @@ -40,7 +40,7 @@ #ifdef _MSC_VER #define TESTNGPP_THROW(...) #else -#define TESTNGPP_THROW(...) throw(__VA_ARGS__) +#define TESTNGPP_THROW(...) #endif #endif diff --git a/tests/3rdparty/testngpp/src/except/Exception.cpp b/tests/3rdparty/testngpp/src/except/Exception.cpp index 1d5f221..87216a1 100644 --- a/tests/3rdparty/testngpp/src/except/Exception.cpp +++ b/tests/3rdparty/testngpp/src/except/Exception.cpp @@ -40,7 +40,7 @@ unsigned int Exception::getLineOfFile() const } ////////////////////////////////////////////////////////// -const char* Exception::what() const TESTNGPP_THROW() +const char* Exception::what() const throw() { return errMsg.c_str(); } diff --git a/tests/3rdparty/testngpp/src/mem_checker/debug_new.cpp b/tests/3rdparty/testngpp/src/mem_checker/debug_new.cpp index 6c7dd0d..acfeb22 100644 --- a/tests/3rdparty/testngpp/src/mem_checker/debug_new.cpp +++ b/tests/3rdparty/testngpp/src/mem_checker/debug_new.cpp @@ -880,12 +880,12 @@ void* operator new[](size_t size, const char* file, int line) #endif } -void* operator new(size_t size) throw(std::bad_alloc) +void* operator new(size_t size) { return operator new(size, (char*)_DEBUG_NEW_CALLER_ADDRESS, 0); } -void* operator new[](size_t size) throw(std::bad_alloc) +void* operator new[](size_t size) { return operator new[](size, (char*)_DEBUG_NEW_CALLER_ADDRESS, 0); }