commit 3a8b1b5add69cb46e8656bab18f0d5f763296f9f
author Junxiao Shi <git@mail1.yoursunny.com> Sat Nov 08 21:26:07 2014 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Sun Nov 09 09:47:55 2014 -0700
tree 9f22dba2d370fbeb0f57607aa97739343367cd68
parent 56a21bf34a7dacbc65afd347e0049efe628764b1

table: simplify dead nonce list with C++11 features

refs #2100

Change-Id: I095bae18f47f4d1c85830fb9ceb87053fe3529e7

daemon/table/dead-nonce-list.cpp

diff --git a/daemon/table/dead-nonce-list.cpp b/daemon/table/dead-nonce-list.cpp
index 71dfcb3..be6afd8 100644
--- a/daemon/table/dead-nonce-list.cpp
+++ b/daemon/table/dead-nonce-list.cpp
@@ -68,14 +68,16 @@
   scheduler::cancel(m_markEvent);
   scheduler::cancel(m_adjustCapacityEvent);
 
-  BOOST_ASSERT(MIN_LIFETIME <= DEFAULT_LIFETIME);
-  BOOST_ASSERT(INITIAL_CAPACITY >= MIN_CAPACITY);
-  BOOST_ASSERT(INITIAL_CAPACITY <= MAX_CAPACITY);
-  BOOST_ASSERT(static_cast<size_t>(MIN_CAPACITY * CAPACITY_UP) > MIN_CAPACITY);
-  BOOST_ASSERT(static_cast<size_t>(MAX_CAPACITY * CAPACITY_DOWN) < MAX_CAPACITY);
-  BOOST_ASSERT(CAPACITY_UP > 1.0);
-  BOOST_ASSERT(CAPACITY_DOWN < 1.0);
-  BOOST_ASSERT(EVICT_LIMIT >= 1);
+  BOOST_ASSERT_MSG(DEFAULT_LIFETIME >= MIN_LIFETIME, "DEFAULT_LIFETIME is too small");
+  static_assert(INITIAL_CAPACITY >= MIN_CAPACITY, "INITIAL_CAPACITY is too small");
+  static_assert(INITIAL_CAPACITY <= MAX_CAPACITY, "INITIAL_CAPACITY is too large");
+  BOOST_ASSERT_MSG(static_cast<size_t>(MIN_CAPACITY * CAPACITY_UP) > MIN_CAPACITY,
+                   "CAPACITY_UP must be able to increase from MIN_CAPACITY");
+  BOOST_ASSERT_MSG(static_cast<size_t>(MAX_CAPACITY * CAPACITY_DOWN) < MAX_CAPACITY,
+                   "CAPACITY_DOWN must be able to decrease from MAX_CAPACITY");
+  BOOST_ASSERT_MSG(CAPACITY_UP > 1.0, "CAPACITY_UP must adjust up");
+  BOOST_ASSERT_MSG(CAPACITY_DOWN < 1.0, "CAPACITY_DOWN must adjust down");
+  static_assert(EVICT_LIMIT >= 1, "EVICT_LIMIT must be at least 1");
 }
 
 size_t
@@ -94,7 +96,7 @@
 void
 DeadNonceList::add(const Name& name, uint32_t nonce)
 {
-  Entry entry = this->makeEntry(name, nonce);
+  Entry entry = DeadNonceList::makeEntry(name, nonce);
   m_queue.push_back(entry);
 
   this->evictEntries();