Skip to content

fix compile error for c++17 #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/3rdparty/testngpp/include/testngpp/internal/Error.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/3rdparty/testngpp/include/testngpp/testngpp.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#ifdef _MSC_VER
#define TESTNGPP_THROW(...)
#else
#define TESTNGPP_THROW(...) throw(__VA_ARGS__)
#define TESTNGPP_THROW(...)
#endif

#endif
2 changes: 1 addition & 1 deletion tests/3rdparty/testngpp/src/except/Exception.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
4 changes: 2 additions & 2 deletions tests/3rdparty/testngpp/src/mem_checker/debug_new.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down