From 2345f48094a71b2611fc48452f9076ba1506e241 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sun, 20 May 2012 15:25:10 -0500
Subject: Changed all ASSERTS_ON -> !NO_ASSERTS

---
 src/amount.cc | 2 +-
 src/utils.cc  | 2 +-
 src/utils.h   | 9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/amount.cc b/src/amount.cc
index 9491efcd..6ecb3558 100644
--- a/src/amount.cc
+++ b/src/amount.cc
@@ -900,7 +900,7 @@ void amount_t::annotate(const annotation_t& details)
   if (commodity_t * ann_comm =
       this_base->pool().find_or_create(*this_base, details))
     set_commodity(*ann_comm);
-#ifdef ASSERTS_ON
+#if !NO_ASSERTS
   else
     assert(false);
 #endif
diff --git a/src/utils.cc b/src/utils.cc
index c8f44124..1a82787d 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -38,7 +38,7 @@
  * Assertions
  */
 
-#if ASSERTS_ON
+#if !NO_ASSERTS
 
 namespace ledger {
 
diff --git a/src/utils.h b/src/utils.h
index 0a3afc4d..63b98029 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -103,10 +103,7 @@ namespace ledger {
 #undef assert
 #endif
 
-#if ! NO_ASSERTS
-#define ASSERTS_ON 1
-#endif
-#if ASSERTS_ON
+#if !NO_ASSERTS
 
 namespace ledger {
   void debug_assert(const string& reason, const string& func,
@@ -117,11 +114,11 @@ namespace ledger {
   ((x) ? ((void)0) : debug_assert(#x, BOOST_CURRENT_FUNCTION,   \
                                   __FILE__, __LINE__))
 
-#else // ! ASSERTS_ON
+#else // !NO_ASSERTS
 
 #define assert(x)
 
-#endif // ASSERTS_ON
+#endif // !NO_ASSERTS
 
 /*@}*/
 
-- 
cgit v1.2.3