libAthena/athena
2
0
Fork 0
mirror of https://github.com/libAthena/athena.git synced 2025-12-10 14:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

MSVC build fixes

Browse Source
This commit is contained in:
Jack Andersen
2015-06-19 21:40:15 -07:00
parent 687a7eef64
commit 5a0f2e8ed4
8 changed files with 69 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Athena/InvalidDataException.hpp
View File

@@ -32,7 +32,7 @@ public:
#ifdef _MSC_VER
#define THROW_INVALID_DATA_EXCEPTION(args, ...) \
do { \
if (atGetExceptionHandler()) {atGetExceptionHandler()(__FILE__, AT_PRETTY_FUNCTION, __LINE__, __VA_ARGS__); return; } \
if (atGetExceptionHandler()) {atGetExceptionHandler()(__FILE__, AT_PRETTY_FUNCTION, __LINE__, args, __VA_ARGS__); return; } \
else { std::string msg = Athena::utility::sprintf(args, __VA_ARGS__); \
throw Athena::error::InvalidDataException(msg, __FILE__, AT_PRETTY_FUNCTION, __LINE__); \
} \
@@ -47,9 +47,9 @@ public:
#endif
#ifdef _MSC_VER
#define THROW_INVALID_DATA_EXCEPTION(args, ...) \
#define THROW_INVALID_DATA_EXCEPTION_RETURN(ret, args, ...) \
do { \
if (atGetExceptionHandler()) {atGetExceptionHandler()(__FILE__, AT_PRETTY_FUNCTION, __LINE__, __VA_ARGS__); return; } \
if (atGetExceptionHandler()) {atGetExceptionHandler()(__FILE__, AT_PRETTY_FUNCTION, __LINE__, args, __VA_ARGS__); return ret; } \
else { std::string msg = Athena::utility::sprintf(args, __VA_ARGS__); \
throw Athena::error::InvalidDataException(msg, __FILE__, AT_PRETTY_FUNCTION, __LINE__); \
} \