table: make FIB and StrategyChoice iterators default-constructible
They were previously not default-constructible when compiled with gcc 4.8.4.
refs #3882
Change-Id: I2431c869fb61b7adbe83d5551705981bf8618280
diff --git a/daemon/table/name-tree-iterator.cpp b/daemon/table/name-tree-iterator.cpp
index d7c7362..32f282d 100644
--- a/daemon/table/name-tree-iterator.cpp
+++ b/daemon/table/name-tree-iterator.cpp
@@ -25,20 +25,14 @@
#include "name-tree-iterator.hpp"
#include "name-tree.hpp"
+#include "core/asserts.hpp"
#include "core/logger.hpp"
-
-#include <boost/concept/assert.hpp>
-#include <boost/concept_check.hpp>
#include <boost/range/concepts.hpp>
-#include <type_traits>
namespace nfd {
namespace name_tree {
-BOOST_CONCEPT_ASSERT((boost::ForwardIterator<Iterator>));
-static_assert(std::is_default_constructible<Iterator>::value,
- "Iterator must be default-constructible");
-
+NFD_ASSERT_FORWARD_ITERATOR(Iterator);
BOOST_CONCEPT_ASSERT((boost::ForwardRangeConcept<Range>));
NFD_LOG_INIT("NameTreeIterator");