Author: soliton
Date: Sun Dec 7 17:42:04 2008
New Revision: 31342
URL: http://svn.gna.org/viewcvs/wesnoth?rev=31342&view=rev
Log:
fixed several inconsistencies
Modified:
trunk/src/asserts.hpp
Modified: trunk/src/asserts.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/asserts.hpp?rev=31342&r1=31341&r2=31342&view=diff
==============================================================================
--- trunk/src/asserts.hpp (original)
+++ trunk/src/asserts.hpp Sun Dec 7 17:42:04 2008
@@ -20,21 +20,21 @@
#include <iostream>
//various asserts of standard "equality" tests, such as "equals", "not
equals", "greater than", etc. Example usage:
-//assert_ne(x, y);
+//ASSERT_NE(x, y);
#define ASSERT_EQ(a,b) if((a) != (b)) { std::cerr << __FILE__ << ":" <<
__LINE__ << " ASSERT EQ FAILED: " << #a << " != " << #b << ": " << (a) << " !=
" << (b) << "\n"; abort(); }
#define ASSERT_NE(a,b) if((a) == (b)) { std::cerr << __FILE__ << ":" <<
__LINE__ << " ASSERT NE FAILED: " << #a << " == " << #b << ": " << (a) << " ==
" << (b) << "\n"; abort(); }
-#define ASSERT_GE(a,b) if((a) < (b)) { std::cerr << __FILE__ << ":" <<
__LINE__ << " ASSERT GE FAILED: " << #a << " == " << #b << ": " << (a) << " ==
" << (b) << "\n"; abort(); }
+#define ASSERT_GE(a,b) if((a) < (b)) { std::cerr << __FILE__ << ":" <<
__LINE__ << " ASSERT GE FAILED: " << #a << " < " << #b << ": " << (a) << " < "
<< (b) << "\n"; abort(); }
-#define ASSERT_LE(a,b) if((a) > (b)) { std::cerr << __FILE__ << ":" <<
__LINE__ << " ASSERT LE FAILED: " << #a << " == " << #b << ": " << (a) << " ==
" << (b) << "\n"; abort(); }
+#define ASSERT_LE(a,b) if((a) > (b)) { std::cerr << __FILE__ << ":" <<
__LINE__ << " ASSERT LE FAILED: " << #a << " > " << #b << ": " << (a) << " > "
<< (b) << "\n"; abort(); }
-#define ASSERT_GT(a,b) if((a) <= (b)) { std::cerr << __FILE__ << ":" <<
__LINE__ << " ASSERT GT FAILED: " << #a << " == " << #b << ": " << (a) << " ==
" << (b) << "\n"; abort(); }
+#define ASSERT_GT(a,b) if((a) <= (b)) { std::cerr << __FILE__ << ":" <<
__LINE__ << " ASSERT GT FAILED: " << #a << " <= " << #b << ": " << (a) << " <=
" << (b) << "\n"; abort(); }
-#define assert_lt(a,b) if((a) >= (b)) { std::cerr << __FILE__ << ":" <<
__LINE__ << " ASSERT LT FAILED: " << #a << " == " << #b << ": " << (a) << " ==
" << (b) << "\n"; abort(); }
+#define ASSERT_LT(a,b) if((a) >= (b)) { std::cerr << __FILE__ << ":" <<
__LINE__ << " ASSERT LT FAILED: " << #a << " >= " << #b << ": " << (a) << " >=
" << (b) << "\n"; abort(); }
//for custom logging. Example usage:
-//assert_log(x != y, "x not equal to y. Value of x: " << x << ", y: " << y);
+//ASSERT_LOG(x != y, "x not equal to y. Value of x: " << x << ", y: " << y);
#define ASSERT_LOG(a,b) if( !(a) ) { std::cerr << __FILE__ << ":" << __LINE__
<< " ASSSERTION FAILED: " << b << "\n"; abort(); }
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
