Fix bug in the ordering of 'error-type' and 'error-message' in expects(cond, type, msg)

include/expect/expect.hpp

@@ -41,7 +41,7 @@ namespace contract {
 
 #define EXCEPT_T_TWO(X, Y) Y
 #define EXCEPT_T_THREE(X, Y, Z) Z
-#define EXCEPT_T_FOURPLUS(X, Y, Z, ...) Z
+#define EXCEPT_T_FOURPLUS(X, Y, Z, ...) Y
 
 #define EXCEPT_T(...) EXCEPT_T_HELPER(NUM(__VA_ARGS__), __VA_ARGS__)
 #define EXCEPT_T_HELPER(N, ...) EXCEPT_T_HELPER2(N, __VA_ARGS__)
@@ -49,7 +49,7 @@ namespace contract {
 
 #define EXCEPT_MSG_TWO(X, Y) Y
 #define EXCEPT_MSG_THREE(X, Y, Z) Y
-#define EXCEPT_MSG_FOURPLUS(X, Y, Z, ...) Y
+#define EXCEPT_MSG_FOURPLUS(X, Y, Z, ...) Z
 
 #define EXCEPT_MSG(...) EXCEPT_MSG_HELPER(NUM(__VA_ARGS__), __VA_ARGS__)
 #define EXCEPT_MSG_HELPER(N, ...) EXCEPT_MSG_HELPER2(N, __VA_ARGS__)