From 56924604b31551febe38f18219e8f06124ad4311 Mon Sep 17 00:00:00 2001 From: Radim Kolar Date: Mon, 23 Dec 2013 22:45:22 +0100 Subject: [PATCH 1/4] remove friend class, it was struct --- xorp/fea/data_plane/control_socket/routing_socket.hh | 2 -- 1 file changed, 2 deletions(-) diff --git a/xorp/fea/data_plane/control_socket/routing_socket.hh b/xorp/fea/data_plane/control_socket/routing_socket.hh index 03b8e76f0..f5109b408 100644 --- a/xorp/fea/data_plane/control_socket/routing_socket.hh +++ b/xorp/fea/data_plane/control_socket/routing_socket.hh @@ -143,8 +143,6 @@ private: static uint16_t _instance_cnt; static pid_t _pid; - - friend class RoutingSocketPlumber; // class that hooks observers in and out }; class RoutingSocketObserver { From 404e61602b9c657c27c61b0177e22414fde4c326 Mon Sep 17 00:00:00 2001 From: Radim Kolar Date: Tue, 24 Dec 2013 17:34:57 +0100 Subject: [PATCH 2/4] Revert "remove friend class, it was struct" This reverts commit 56924604b31551febe38f18219e8f06124ad4311. --- xorp/fea/data_plane/control_socket/routing_socket.hh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xorp/fea/data_plane/control_socket/routing_socket.hh b/xorp/fea/data_plane/control_socket/routing_socket.hh index f5109b408..03b8e76f0 100644 --- a/xorp/fea/data_plane/control_socket/routing_socket.hh +++ b/xorp/fea/data_plane/control_socket/routing_socket.hh @@ -143,6 +143,8 @@ private: static uint16_t _instance_cnt; static pid_t _pid; + + friend class RoutingSocketPlumber; // class that hooks observers in and out }; class RoutingSocketObserver { From a7ce412b3efefc4ad1f15071b92a0d394b27f6f1 Mon Sep 17 00:00:00 2001 From: Radim Kolar Date: Tue, 24 Dec 2013 17:35:54 +0100 Subject: [PATCH 3/4] redefine RoutingSocketPlumber as class --- xorp/fea/data_plane/control_socket/routing_socket.cc | 2 +- xorp/fea/data_plane/control_socket/routing_socket.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xorp/fea/data_plane/control_socket/routing_socket.cc b/xorp/fea/data_plane/control_socket/routing_socket.cc index 899a8816e..4233beb35 100644 --- a/xorp/fea/data_plane/control_socket/routing_socket.cc +++ b/xorp/fea/data_plane/control_socket/routing_socket.cc @@ -239,7 +239,7 @@ RoutingSocket::io_event(XorpFd fd, IoEventType type) // Observe routing sockets activity // -struct RoutingSocketPlumber { +class RoutingSocketPlumber { typedef RoutingSocket::ObserverList ObserverList; static void diff --git a/xorp/fea/data_plane/control_socket/routing_socket.hh b/xorp/fea/data_plane/control_socket/routing_socket.hh index 03b8e76f0..242102aac 100644 --- a/xorp/fea/data_plane/control_socket/routing_socket.hh +++ b/xorp/fea/data_plane/control_socket/routing_socket.hh @@ -31,7 +31,7 @@ class RoutingSocketObserver; -struct RoutingSocketPlumber; +class RoutingSocketPlumber; /** * RoutingSocket class opens a routing socket and forwards data arriving From fe5620c4035883aaafdcb5ab46a7341a1d75a54e Mon Sep 17 00:00:00 2001 From: Radim Kolar Date: Tue, 24 Dec 2013 17:41:11 +0100 Subject: [PATCH 4/4] declare all members public, it was struct before turning into class --- xorp/fea/data_plane/control_socket/routing_socket.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorp/fea/data_plane/control_socket/routing_socket.cc b/xorp/fea/data_plane/control_socket/routing_socket.cc index 4233beb35..1689cabdf 100644 --- a/xorp/fea/data_plane/control_socket/routing_socket.cc +++ b/xorp/fea/data_plane/control_socket/routing_socket.cc @@ -241,7 +241,7 @@ RoutingSocket::io_event(XorpFd fd, IoEventType type) class RoutingSocketPlumber { typedef RoutingSocket::ObserverList ObserverList; - + public: static void plumb(RoutingSocket& r, RoutingSocketObserver* o) {