Commit 7183650e authored by Joseph Noir's avatar Joseph Noir

Fix formatting

parent eec4d027
...@@ -54,16 +54,14 @@ struct tcp_stream_socket : abstract_socket<tcp_stream_socket> { ...@@ -54,16 +54,14 @@ struct tcp_stream_socket : abstract_socket<tcp_stream_socket> {
/// @preferred Preferred IP version. /// @preferred Preferred IP version.
/// @returns The connected socket or an error. /// @returns The connected socket or an error.
/// @relates stream_socket /// @relates stream_socket
expected<stream_socket> expected<stream_socket> make_connected_socket(ip_address host, uint16_t port);
make_connected_socket(ip_address host, uint16_t port);
/// Create a `stream_socket` connected to `auth`. /// Create a `stream_socket` connected to `auth`.
/// @param authority The remote host to connecto to. /// @param authority The remote host to connecto to.
/// @preferred Preferred IP version. /// @preferred Preferred IP version.
/// @returns The connected socket or an error. /// @returns The connected socket or an error.
/// @relates stream_socket /// @relates stream_socket
expected<stream_socket> expected<stream_socket> make_connected_socket(const uri::authority_type& auth);
make_connected_socket(const uri::authority_type& auth);
} // namespace net } // namespace net
} // namespace caf } // namespace caf
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
#include "caf/string_view.hpp" #include "caf/string_view.hpp"
#ifndef HOST_NAME_MAX #ifndef HOST_NAME_MAX
#define HOST_NAME_MAX 255 # define HOST_NAME_MAX 255
#endif #endif
using std::pair;
using std::string; using std::string;
using std::vector; using std::vector;
using std::pair;
namespace caf { namespace caf {
namespace net { namespace net {
...@@ -128,10 +128,10 @@ std::vector<ip_address> resolve(const std::string& host) { ...@@ -128,10 +128,10 @@ std::vector<ip_address> resolve(const std::string& host) {
} }
} }
// TODO: Should we just prefer ipv6 or use a config option? // TODO: Should we just prefer ipv6 or use a config option?
//std::stable_sort(std::begin(results), std::end(results), // std::stable_sort(std::begin(results), std::end(results),
// [](const ip_address& lhs, const ip_address& rhs) { // [](const ip_address& lhs, const ip_address& rhs) {
// return !lhs.embeds_v4() && rhs.embeds_v4(); // return !lhs.embeds_v4() && rhs.embeds_v4();
// }); // });
return results; return results;
} }
......
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
#include "caf/policy/doorman.hpp" #include "caf/policy/doorman.hpp"
#include "caf/net/endpoint_manager.hpp" #include "caf/net/endpoint_manager.hpp"
#include "caf/net/ip.hpp"
#include "caf/net/make_endpoint_manager.hpp" #include "caf/net/make_endpoint_manager.hpp"
#include "caf/net/multiplexer.hpp" #include "caf/net/multiplexer.hpp"
#include "caf/net/tcp_accept_socket.hpp" #include "caf/net/tcp_accept_socket.hpp"
#include "caf/uri.hpp" #include "caf/uri.hpp"
#include "caf/net/ip.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
......
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