diff options
Diffstat (limited to 'libtransport/src/hicn')
4 files changed, 6 insertions, 6 deletions
diff --git a/libtransport/src/hicn/transport/interfaces/callbacks.cc b/libtransport/src/hicn/transport/interfaces/callbacks.cc index af470898c..2574e7720 100644 --- a/libtransport/src/hicn/transport/interfaces/callbacks.cc +++ b/libtransport/src/hicn/transport/interfaces/callbacks.cc @@ -19,7 +19,7 @@ namespace transport { namespace interface { -nullptr_t VOID_HANDLER = nullptr; +std::nullptr_t VOID_HANDLER = nullptr; } // namespace interface diff --git a/libtransport/src/hicn/transport/interfaces/callbacks.h b/libtransport/src/hicn/transport/interfaces/callbacks.h index 41b6213fe..7194cca42 100644 --- a/libtransport/src/hicn/transport/interfaces/callbacks.h +++ b/libtransport/src/hicn/transport/interfaces/callbacks.h @@ -107,7 +107,7 @@ using ProducerContentObjectCallback = using ProducerInterestCallback = std::function<void(ProducerSocket &, core::Interest &)>; -extern nullptr_t VOID_HANDLER; +extern std::nullptr_t VOID_HANDLER; } // namespace interface diff --git a/libtransport/src/hicn/transport/interfaces/socket_consumer.cc b/libtransport/src/hicn/transport/interfaces/socket_consumer.cc index 6eae23c85..14cd27b6b 100644 --- a/libtransport/src/hicn/transport/interfaces/socket_consumer.cc +++ b/libtransport/src/hicn/transport/interfaces/socket_consumer.cc @@ -135,8 +135,8 @@ int ConsumerSocket::rescheduleOnIOService(int socket_option_key, /* Condition variable for the wait */ std::condition_variable cv; bool done = false; - io_service_.dispatch([this, &socket_option_key, &socket_option_value, &mtx, - &cv, &result, &done, &func]() { + io_service_.dispatch([&socket_option_key, &socket_option_value, &mtx, + &result, &done, &func]() { std::unique_lock<std::mutex> lck(mtx); done = true; result = func(socket_option_key, socket_option_value); diff --git a/libtransport/src/hicn/transport/interfaces/socket_producer.cc b/libtransport/src/hicn/transport/interfaces/socket_producer.cc index bc93e77c6..f90197490 100644 --- a/libtransport/src/hicn/transport/interfaces/socket_producer.cc +++ b/libtransport/src/hicn/transport/interfaces/socket_producer.cc @@ -406,8 +406,8 @@ int ProducerSocket::rescheduleOnIOService(int socket_option_key, /* Condition variable for the wait */ std::condition_variable cv; bool done = false; - io_service_.dispatch([this, &socket_option_key, &socket_option_value, &mtx, - &cv, &result, &done, &func]() { + io_service_.dispatch([&socket_option_key, &socket_option_value, &mtx, + &result, &done, &func]() { std::unique_lock<std::mutex> lck(mtx); done = true; result = func(socket_option_key, socket_option_value); |