table: MeasurementsAccessor uses StrategyChoice
This commit also deletes fib::Entry::set/getStrategy attribute.
refs #1276
Change-Id: I57dfe842a8024e0ad9908ba8a9c415d5f4ac1bbe
diff --git a/daemon/table/fib-entry.hpp b/daemon/table/fib-entry.hpp
index f5c0fae..aac8fc5 100644
--- a/daemon/table/fib-entry.hpp
+++ b/daemon/table/fib-entry.hpp
@@ -11,10 +11,6 @@
namespace nfd {
-namespace fw {
-class Strategy;
-}
-
namespace fib {
/** \class NextHopList
@@ -34,29 +30,23 @@
public:
explicit
Entry(const Name& prefix);
-
+
const Name&
getPrefix() const;
-
+
const NextHopList&
getNextHops() const;
-
+
bool
hasNextHop(shared_ptr<Face> face) const;
-
+
/// adds a nexthop
void
addNextHop(shared_ptr<Face> face, int32_t cost);
-
+
/// removes a nexthop
void
removeNextHop(shared_ptr<Face> face);
-
- const fw::Strategy&
- getStrategy() const;
-
- void
- setStrategy(shared_ptr<fw::Strategy> strategy);
private:
/// sorts the nexthop list
@@ -66,7 +56,6 @@
private:
Name m_prefix;
NextHopList m_nextHops;
- shared_ptr<fw::Strategy> m_strategy;
};
@@ -82,13 +71,6 @@
return m_nextHops;
}
-inline const fw::Strategy&
-Entry::getStrategy() const
-{
- BOOST_ASSERT(static_cast<bool>(m_strategy));
- return *m_strategy;
-}
-
} // namespace fib
} // namespace nfd