rib+tools: use ndn::nfd::RouteOrigin instead of uint64_t

Change-Id: Ic8cbe95491a41e1d34b66d406da8637aeb5fd9e3
Refs: #3903
diff --git a/tests/rib/fib-updates-common.hpp b/tests/rib/fib-updates-common.hpp
index df41c3e..59505bc 100644
--- a/tests/rib/fib-updates-common.hpp
+++ b/tests/rib/fib-updates-common.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2016,  Regents of the University of California,
+ * Copyright (c) 2014-2017,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -23,6 +23,9 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef NFD_TESTS_RIB_FIB_UPDATES_COMMON_HPP
+#define NFD_TESTS_RIB_FIB_UPDATES_COMMON_HPP
+
 #include "rib/fib-updater.hpp"
 #include "rib-test-common.hpp"
 #include "tests/identity-management-fixture.hpp"
@@ -67,7 +70,9 @@
   }
 
   void
-  insertRoute(const Name& name, uint64_t faceId, uint64_t origin, uint64_t cost, uint64_t flags)
+  insertRoute(const Name& name, uint64_t faceId,
+              std::underlying_type<ndn::nfd::RouteOrigin>::type origin,
+              uint64_t cost, uint64_t flags)
   {
     Route route = createRoute(faceId, origin, cost, flags);
 
@@ -80,7 +85,8 @@
   }
 
   void
-  eraseRoute(const Name& name, uint64_t faceId, uint64_t origin)
+  eraseRoute(const Name& name, uint64_t faceId,
+             std::underlying_type<ndn::nfd::RouteOrigin>::type origin)
   {
     Route route = createRoute(faceId, origin, 0, 0);
 
@@ -175,3 +181,5 @@
 } // namespace tests
 } // namespace rib
 } // namespace nfd
+
+#endif // NFD_TESTS_RIB_FIB_UPDATES_COMMON_HPP