maintenance

actor-framework · Oct 19, 2012 · 7940555 · 7940555
1 parent 94adf39
commit 7940555
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/cppa/network/ipv4_acceptor.hpp b/cppa/network/ipv4_acceptor.hpp
@@ -44,7 +44,7 @@ class ipv4_acceptor : public acceptor {
  public:
 
     static std::unique_ptr<acceptor> create(std::uint16_t port,
-                                                     const char* addr);
+                                            const char* addr = nullptr);
 
     ~ipv4_acceptor();
 

diff --git a/src/default_protocol.cpp b/src/default_protocol.cpp
@@ -60,30 +60,27 @@ atom_value default_protocol::identifier() const {
 }
 
 void default_protocol::publish(const actor_ptr& whom, variant_args args) {
-    CPPA_LOG_TRACE("whom: " << to_string(whom)
+    CPPA_LOG_TRACE(CPPA_TARG(whom, to_string)
                    << ", args.size() = " << args.size());
     if (!whom) return;
     CPPA_REQUIRE(args.size() == 2 || args.size() == 1);
     auto i = args.begin();
     if (args.size() == 1) {
         auto port = get<uint16_t>(*i++);
-        publish(whom,
-                unique_ptr<acceptor>(ipv4_acceptor::create(port, nullptr)),
-                {});
+        publish(whom, ipv4_acceptor::create(port), {});
     }
     else if (args.size() == 2) {
         auto port = get<uint16_t>(*i++);
         auto& addr = get<string>(*i);
-        publish(whom, unique_ptr<acceptor>(ipv4_acceptor::create(port, addr.c_str())), {});
+        publish(whom, ipv4_acceptor::create(port, addr.c_str()), {});
     }
     else throw logic_error("wrong number of arguments, expected one or two");
 }
 
 void default_protocol::publish(const actor_ptr& whom,
                                std::unique_ptr<acceptor> ptr,
                                variant_args args                  ) {
-    CPPA_LOG_TRACE("whom: " << to_string(whom)
-                   << ", ptr = " << ptr.get()
+    CPPA_LOG_TRACE(CPPA_TARG(whom, to_string) << ", " << CPPA_MARG(ptr, get)
                    << ", args.size() = " << args.size());
     if (!whom) return;
     CPPA_REQUIRE(args.size() == 0);

diff --git a/src/ipv4_acceptor.cpp b/src/ipv4_acceptor.cpp
@@ -103,7 +103,7 @@ ipv4_acceptor::ipv4_acceptor(native_socket_type fd, bool nonblocking)
 : m_fd(fd), m_is_nonblocking(nonblocking) { }
 
 std::unique_ptr<acceptor> ipv4_acceptor::create(std::uint16_t port,
-                                                         const char* addr) {
+                                                const char* addr) {
     native_socket_type sockfd;
     sockfd = socket(AF_INET, SOCK_STREAM, 0);
     if (sockfd == invalid_socket) {