|
|
@@ -70,15 +70,7 @@ namespace contract {
|
|
|
#define EXCEPT_MSG_HELPER(N, ...) EXCEPT_MSG_HELPER2(N, __VA_ARGS__)
|
|
|
#define EXCEPT_MSG_HELPER2(N, ...) EXCEPT_MSG_##N(__VA_ARGS__)
|
|
|
|
|
|
-#if defined( __clang__ ) || defined( __GNUC__ )
|
|
|
-# define FUNCTION STRING(__PRETTY_FUNCTION__)
|
|
|
-#elif defined( _MSC_VER )
|
|
|
-# define FUNCTION STRING(__FUNCTION__)
|
|
|
-#else
|
|
|
-# define FUNCTION "???"
|
|
|
-#endif
|
|
|
-
|
|
|
-#define LOCATION_MSG ". in " FUNCTION "(" __FILE__ ":" STRING( __LINE__ ) ")"
|
|
|
+#define LOCATION_MSG ". in " __FILE__ ":" STRING( __LINE__ )
|
|
|
|
|
|
#define DEF_MSG( header, expr ) \
|
|
|
header " failed: " STRING(expr) LOCATION_MSG
|