Move type_t and scope_t out from tipc::sockaddr

Having nested constant definitions makes their use a little annoying.

diff --git a/src/linux/tipc.hpp b/src/linux/tipc.hpp
index cb56413647573f9df7946b2e26c4573d2e4bdf57..0fc49fbad9b631d3e3fbd7374362d82990317c4b 100644 (file)
--- a/src/linux/tipc.hpp
+++ b/src/linux/tipc.hpp
@@ -315,6 +315,26 @@ struct subscr_event: tipc_event
 
 };
 
 
 };
 

+/// Type of TIPC address
+enum type_t
+{
+       ID = TIPC_ADDR_ID,           ///< Port ID
+       NAME = TIPC_ADDR_NAME,       ///< Port name
+       NAMESEQ = TIPC_ADDR_NAMESEQ  ///< Name sequence or multicast
+};
+
+/**
+ * Bind scope.
+ *
+ * @see TIPC documentation: 2.1.2 bind
+ */
+enum scope_t
+{
+       ZONE = TIPC_ZONE_SCOPE,       ///< Zone scope.
+       CLUSTER = TIPC_CLUSTER_SCOPE, ///< Cluster scope.
+       NODE = TIPC_NODE_SCOPE        ///< Node scope.
+};
+

 /**
  * TIPC socket address (name).
  *
 /**
  * TIPC socket address (name).
  *


@@ -329,26 +349,6 @@ struct subscr_event: tipc_event
 struct sockaddr: sockaddr_tipc
 {
 
 struct sockaddr: sockaddr_tipc
 {
 

-       /// Type of TIPC address
-       enum type_t
-       {
-               ID = TIPC_ADDR_ID, ///< Port ID
-               NAME = TIPC_ADDR_NAME, ///< Port name
-               NAMESEQ = TIPC_ADDR_NAMESEQ ///< Name sequence or multicast
-       };
-
-       /**
-        * Bind scope.
-        *
-        * @see TIPC documentation: 2.1.2 bind
-        */
-       enum scope_t
-       {
-               ZONE = TIPC_ZONE_SCOPE,       ///< Zone scope.
-               CLUSTER = TIPC_CLUSTER_SCOPE, ///< Cluster scope.
-               NODE = TIPC_NODE_SCOPE        ///< Node scope.
-       };
-

        /// Constructor.
        sockaddr() throw ();
 
        /// Constructor.
        sockaddr() throw ();
 


@@ -675,7 +675,7 @@ posixx::linux::tipc::sockaddr::sockaddr(nameseq nameseq, scope_t s) throw ()
 }
 
 inline
 }
 
 inline

-posixx::linux::tipc::sockaddr::type_t posixx::linux::tipc::sockaddr::type()
+posixx::linux::tipc::type_t posixx::linux::tipc::sockaddr::type()

                const throw ()
 {
        return static_cast< type_t >(addrtype);
                const throw ()
 {
        return static_cast< type_t >(addrtype);

diff --git a/src/linux/tipc/print.hpp b/src/linux/tipc/print.hpp
index d0f592463641065b4508e0ce954a6dba28054818..ae067df945d2fab46fc5213ec7b2aacf4bb497cd 100644 (file)
--- a/src/linux/tipc/print.hpp
+++ b/src/linux/tipc/print.hpp
@@ -94,13 +94,13 @@ inline
 std::ostream& operator << (std::ostream& os,
                const posixx::linux::tipc::sockaddr& sa) throw()
 {
 std::ostream& operator << (std::ostream& os,
                const posixx::linux::tipc::sockaddr& sa) throw()
 {

-       using posixx::linux::tipc::sockaddr;
+       using namespace posixx::linux::tipc;

        os << "sockaddr(" << sa.family << ", " << unsigned(sa.scope) << ", ";
        os << "sockaddr(" << sa.family << ", " << unsigned(sa.scope) << ", ";

-       if (sa.type() == sockaddr::ID)
+       if (sa.type() == ID)

                os << sa.port_id();
                os << sa.port_id();

-       else if (sa.type() == sockaddr::NAME)
+       else if (sa.type() == NAME)

                os << sa.port_name() << ", " << sa.name_domain();
                os << sa.port_name() << ", " << sa.name_domain();

-       else if (sa.type() == sockaddr::NAMESEQ)
+       else if (sa.type() == NAMESEQ)

                os << sa.name_seq();
        else
                os << "[UNKNOW addrtype=" << sa.addrtype << "]";
                os << sa.name_seq();
        else
                os << "[UNKNOW addrtype=" << sa.addrtype << "]";

diff --git a/test/linux/tipc/sockaddr.cpp b/test/linux/tipc/sockaddr.cpp
index 45ef3c475fdcbe5de52f4071bc16cdcdb5453a3b..f304ce2d809f1539fb9b87a63a87b6c79c1718c8 100644 (file)
--- a/test/linux/tipc/sockaddr.cpp
+++ b/test/linux/tipc/sockaddr.cpp
@@ -408,9 +408,9 @@ BOOST_AUTO_TEST_CASE( linux_tipc_sockaddr_id_ctor_test )
        portid id(12313, addr(1, 1, 77));
        tipc::sockaddr sp(id);
        BOOST_CHECK_EQUAL( sp.family, AF_TIPC );
        portid id(12313, addr(1, 1, 77));
        tipc::sockaddr sp(id);
        BOOST_CHECK_EQUAL( sp.family, AF_TIPC );

-       BOOST_CHECK_EQUAL( sp.addrtype, tipc::sockaddr::ID );
-       BOOST_CHECK_EQUAL( sp.type(), tipc::sockaddr::ID );
-       BOOST_CHECK_EQUAL( sp.scope, tipc::sockaddr::ZONE );
+       BOOST_CHECK_EQUAL( sp.addrtype, ID );
+       BOOST_CHECK_EQUAL( sp.type(), ID );
+       BOOST_CHECK_EQUAL( sp.scope, ZONE );

        BOOST_CHECK_EQUAL( sp.port_id(), id );
        BOOST_CHECK_EQUAL( sp.addr.id.ref, id.ref );
        BOOST_CHECK_EQUAL( sp.addr.id.node, id.node );
        BOOST_CHECK_EQUAL( sp.port_id(), id );
        BOOST_CHECK_EQUAL( sp.addr.id.ref, id.ref );
        BOOST_CHECK_EQUAL( sp.addr.id.node, id.node );


@@ -420,11 +420,11 @@ BOOST_AUTO_TEST_CASE( linux_tipc_sockaddr_id_ctor_test )
 
        BOOST_CHECK_EQUAL( sp, tipc::sockaddr(portid(12313, addr(2, 1, 77))) );
 
 
        BOOST_CHECK_EQUAL( sp, tipc::sockaddr(portid(12313, addr(2, 1, 77))) );
 

-       tipc::sockaddr sp2(id, tipc::sockaddr::NODE);
+       tipc::sockaddr sp2(id, NODE);

        BOOST_CHECK_EQUAL( sp2.family, AF_TIPC );
        BOOST_CHECK_EQUAL( sp2.family, AF_TIPC );

-       BOOST_CHECK_EQUAL( sp2.addrtype, tipc::sockaddr::ID );
-       BOOST_CHECK_EQUAL( sp2.type(), tipc::sockaddr::ID );
-       BOOST_CHECK_EQUAL( sp2.scope, tipc::sockaddr::NODE );
+       BOOST_CHECK_EQUAL( sp2.addrtype, ID );
+       BOOST_CHECK_EQUAL( sp2.type(), ID );
+       BOOST_CHECK_EQUAL( sp2.scope, NODE );

        BOOST_CHECK_EQUAL( sp2.port_id(), id );
        BOOST_CHECK_EQUAL( sp2.addr.id.ref, id.ref );
        BOOST_CHECK_EQUAL( sp2.addr.id.node, id.node );
        BOOST_CHECK_EQUAL( sp2.port_id(), id );
        BOOST_CHECK_EQUAL( sp2.addr.id.ref, id.ref );
        BOOST_CHECK_EQUAL( sp2.addr.id.node, id.node );


@@ -437,9 +437,9 @@ BOOST_AUTO_TEST_CASE( linux_tipc_sockaddr_name_ctor_test )
        name n(12313, 77);
        tipc::sockaddr sn(n);
        BOOST_CHECK_EQUAL( sn.family, AF_TIPC );
        name n(12313, 77);
        tipc::sockaddr sn(n);
        BOOST_CHECK_EQUAL( sn.family, AF_TIPC );

-       BOOST_CHECK_EQUAL( sn.addrtype, tipc::sockaddr::NAME );
-       BOOST_CHECK_EQUAL( sn.type(), tipc::sockaddr::NAME );
-       BOOST_CHECK_EQUAL( sn.scope, tipc::sockaddr::ZONE );
+       BOOST_CHECK_EQUAL( sn.addrtype, NAME );
+       BOOST_CHECK_EQUAL( sn.type(), NAME );
+       BOOST_CHECK_EQUAL( sn.scope, ZONE );

        BOOST_CHECK_EQUAL( sn.port_name(), n );
        BOOST_CHECK_EQUAL( sn.addr.name.name.type, n.type );
        BOOST_CHECK_EQUAL( sn.addr.name.name.instance, n.instance );
        BOOST_CHECK_EQUAL( sn.port_name(), n );
        BOOST_CHECK_EQUAL( sn.addr.name.name.type, n.type );
        BOOST_CHECK_EQUAL( sn.addr.name.name.instance, n.instance );


@@ -452,8 +452,8 @@ BOOST_AUTO_TEST_CASE( linux_tipc_sockaddr_name_ctor_test )
        sn.name_domain().node(999);
        BOOST_CHECK_EQUAL( sn.name_domain(), addr(0, 0, 999) );
 
        sn.name_domain().node(999);
        BOOST_CHECK_EQUAL( sn.name_domain(), addr(0, 0, 999) );
 

-       BOOST_CHECK_EQUAL( sn, tipc::sockaddr(name(999, 77),
-                               tipc::sockaddr::ZONE, addr(0, 0, 999)) );
+       BOOST_CHECK_EQUAL( sn, tipc::sockaddr(name(999, 77), ZONE,
+                               addr(0, 0, 999)) );

 
 }
 
 
 }
 


@@ -463,9 +463,9 @@ BOOST_AUTO_TEST_CASE( linux_tipc_sockaddr_nameseq_ctor_test )
        nameseq ns(12313, 77);
        tipc::sockaddr sns(ns);
        BOOST_CHECK_EQUAL( sns.family, AF_TIPC );
        nameseq ns(12313, 77);
        tipc::sockaddr sns(ns);
        BOOST_CHECK_EQUAL( sns.family, AF_TIPC );

-       BOOST_CHECK_EQUAL( sns.addrtype, tipc::sockaddr::NAMESEQ );
-       BOOST_CHECK_EQUAL( sns.type(), tipc::sockaddr::NAMESEQ );
-       BOOST_CHECK_EQUAL( sns.scope, tipc::sockaddr::ZONE );
+       BOOST_CHECK_EQUAL( sns.addrtype, NAMESEQ );
+       BOOST_CHECK_EQUAL( sns.type(), NAMESEQ );
+       BOOST_CHECK_EQUAL( sns.scope, ZONE );

        BOOST_CHECK_EQUAL( sns.name_seq(), ns );
        BOOST_CHECK_EQUAL( sns.addr.nameseq.type, ns.type );
        BOOST_CHECK_EQUAL( sns.addr.nameseq.lower, ns.lower );
        BOOST_CHECK_EQUAL( sns.name_seq(), ns );
        BOOST_CHECK_EQUAL( sns.addr.nameseq.type, ns.type );
        BOOST_CHECK_EQUAL( sns.addr.nameseq.lower, ns.lower );