ustl: Get fib2mrib compiling with uSTL.

Signed-off-by: Ben Greear <greearb@candelatech.com>
greearb · Jun 15, 2010 · 6067d07 · 6067d07
1 parent 80fcd66
commit 6067d07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/xorp/fib2mrib/fib2mrib_node.cc b/xorp/fib2mrib/fib2mrib_node.cc
@@ -1249,7 +1249,7 @@ Fib2mribNode::do_filtering(Fib2mribRoute& route)
 	bool accepted;
 
 	debug_msg("[FIB2MRIB] Running filter: %s on route: %s\n",
-		  filter::filter2str(filter::IMPORT).c_str(),
+		  filter::filter2str(filter::IMPORT),
 		  route.network().str().c_str());
 	accepted = _policy_filters.run_filter(filter::IMPORT, varrw);
 
@@ -1263,7 +1263,7 @@ Fib2mribNode::do_filtering(Fib2mribRoute& route)
 
 	// Export source-match filtering
 	debug_msg("[FIB2MRIB] Running filter: %s on route: %s\n",
-		  filter::filter2str(filter::EXPORT_SOURCEMATCH).c_str(),
+		  filter::filter2str(filter::EXPORT_SOURCEMATCH),
 		  route.network().str().c_str());
 
 	_policy_filters.run_filter(filter::EXPORT_SOURCEMATCH, varrw2);

diff --git a/xorp/fib2mrib/fib2mrib_node.hh b/xorp/fib2mrib/fib2mrib_node.hh
@@ -100,6 +100,10 @@ public:
 	  _route_type(IDLE_ROUTE), _is_ignored(false),
 	  _is_filtered(false), _is_accepted_by_nexthop(false) {}
 
+#ifdef XORP_USE_USTL
+    Fib2mribRoute() { }
+#endif
+
     /**
      * Equality Operator
      *