Merge "Templatize path_resolver_test to run for inet and inet6"

Juniper · Nov 3, 2015 · 113dc9a · 113dc9a
2 parents 0be3e14 + 3bf53cb
commit 113dc9a
Show file tree

Hide file tree

Showing 2 changed files with 697 additions and 525 deletions.
diff --git a/src/bgp/routing-instance/path_resolver.h b/src/bgp/routing-instance/path_resolver.h
@@ -100,7 +100,7 @@ class PathResolver {
 private:
     friend class PathResolverPartition;
     friend class ResolverNexthop;
-    friend class PathResolverTest;
+    template <typename U> friend class PathResolverTest;
 
     class DeleteActor;
     typedef std::map<IpAddress, ResolverNexthop *> ResolverNexthopMap;