Commit b0e66758 authored by Joseph Noir's avatar Joseph Noir

Flatten caf::io::network::policy namespace

parent 4260a34b
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "caf/io/network/native_socket.hpp" #include "caf/io/network/native_socket.hpp"
#include "caf/io/network/datagram_handler_impl.hpp" #include "caf/io/network/datagram_handler_impl.hpp"
#include "caf/io/network/policy/udp.hpp" #include "caf/policy/udp.hpp"
namespace caf { namespace caf {
namespace io { namespace io {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "caf/io/network/acceptor_impl.hpp" #include "caf/io/network/acceptor_impl.hpp"
#include "caf/io/network/native_socket.hpp" #include "caf/io/network/native_socket.hpp"
#include "caf/io/network/policy/tcp.hpp" #include "caf/policy/tcp.hpp"
namespace caf { namespace caf {
namespace io { namespace io {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "caf/io/network/stream_impl.hpp" #include "caf/io/network/stream_impl.hpp"
#include "caf/io/network/native_socket.hpp" #include "caf/io/network/native_socket.hpp"
#include "caf/io/network/policy/tcp.hpp" #include "caf/policy/tcp.hpp"
namespace caf { namespace caf {
namespace io { namespace io {
......
...@@ -21,18 +21,16 @@ ...@@ -21,18 +21,16 @@
#include "caf/io/network/default_multiplexer.hpp" #include "caf/io/network/default_multiplexer.hpp"
namespace caf { namespace caf {
namespace io {
namespace network {
namespace policy { namespace policy {
/// Function signature of `read_some`. /// Function signature of `read_some`.
using read_some_fun = decltype(read_some)*; using read_some_fun = decltype(io::network::read_some)*;
/// Function signature of `wite_some`. /// Function signature of `wite_some`.
using write_some_fun = decltype(write_some)*; using write_some_fun = decltype(io::network::write_some)*;
/// Function signature of `try_accept`. /// Function signature of `try_accept`.
using try_accept_fun = decltype(try_accept)*; using try_accept_fun = decltype(io::network::try_accept)*;
/// Policy object for wrapping default TCP operations. /// Policy object for wrapping default TCP operations.
struct tcp { struct tcp {
...@@ -42,6 +40,4 @@ struct tcp { ...@@ -42,6 +40,4 @@ struct tcp {
}; };
} // namespace policy } // namespace policy
} // namespace network
} // namespace io
} // namespace caf } // namespace caf
...@@ -21,15 +21,13 @@ ...@@ -21,15 +21,13 @@
#include "caf/io/network/default_multiplexer.hpp" #include "caf/io/network/default_multiplexer.hpp"
namespace caf { namespace caf {
namespace io {
namespace network {
namespace policy { namespace policy {
/// Function signature of read_datagram /// Function signature of read_datagram
using read_datagram_fun = decltype(read_datagram)*; using read_datagram_fun = decltype(io::network::read_datagram)*;
/// Function signature of write_datagram /// Function signature of write_datagram
using write_datagram_fun = decltype(write_datagram)*; using write_datagram_fun = decltype(io::network::write_datagram)*;
/// Policy object for wrapping default UDP operations /// Policy object for wrapping default UDP operations
struct udp { struct udp {
...@@ -38,6 +36,4 @@ struct udp { ...@@ -38,6 +36,4 @@ struct udp {
}; };
} // namespace policy } // namespace policy
} // namespace network
} // namespace io
} // namespace caf } // namespace caf
...@@ -26,17 +26,11 @@ ...@@ -26,17 +26,11 @@
#include "caf/io/broker.hpp" #include "caf/io/broker.hpp"
#include "caf/io/middleman.hpp" #include "caf/io/middleman.hpp"
#include "caf/io/network/stream.hpp"
#include "caf/io/network/acceptor.hpp"
#include "caf/io/network/protocol.hpp" #include "caf/io/network/protocol.hpp"
#include "caf/io/network/interfaces.hpp" #include "caf/io/network/interfaces.hpp"
#include "caf/io/network/pipe_reader.hpp"
#include "caf/io/network/scribe_impl.hpp" #include "caf/io/network/scribe_impl.hpp"
#include "caf/io/network/doorman_impl.hpp" #include "caf/io/network/doorman_impl.hpp"
#include "caf/io/network/datagram_handler.hpp"
#include "caf/io/network/datagram_servant_impl.hpp" #include "caf/io/network/datagram_servant_impl.hpp"
#include "caf/io/network/policy/tcp.hpp"
#include "caf/io/network/policy/udp.hpp"
#include "caf/scheduler/abstract_coordinator.hpp" #include "caf/scheduler/abstract_coordinator.hpp"
......
...@@ -16,20 +16,16 @@ ...@@ -16,20 +16,16 @@
* http://www.boost.org/LICENSE_1_0.txt. * * http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/ ******************************************************************************/
#include "caf/io/network/policy/tcp.hpp" #include "caf/policy/tcp.hpp"
namespace caf { namespace caf {
namespace io {
namespace network {
namespace policy { namespace policy {
read_some_fun tcp::read_some = caf::io::network::read_some; read_some_fun tcp::read_some = io::network::read_some;
write_some_fun tcp::write_some = caf::io::network::write_some; write_some_fun tcp::write_some = io::network::write_some;
try_accept_fun tcp::try_accept = caf::io::network::try_accept; try_accept_fun tcp::try_accept = io::network::try_accept;
} // policy } // policy
} // namespace network
} // namespace io
} // namespace caf } // namespace caf
...@@ -16,18 +16,14 @@ ...@@ -16,18 +16,14 @@
* http://www.boost.org/LICENSE_1_0.txt. * * http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/ ******************************************************************************/
#include "caf/io/network/policy/udp.hpp" #include "caf/policy/udp.hpp"
namespace caf { namespace caf {
namespace io {
namespace network {
namespace policy { namespace policy {
read_datagram_fun udp::read_datagram = caf::io::network::read_datagram; read_datagram_fun udp::read_datagram = io::network::read_datagram;
write_datagram_fun udp::write_datagram = caf::io::network::write_datagram; write_datagram_fun udp::write_datagram = io::network::write_datagram;
} // policy } // policy
} // namespace network
} // namespace io
} // namespace caf } // namespace caf
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment