Skip to content

Commit 82ecc4d

Browse files
morphogenccmorphogencc
committed
updated asio to v1.18; updated AppBase.h, AppBase.cpp, Osc.h, and Osc.cpp to use the new io_context object instead of the deprecated io_service
1 parent 34c558a commit 82ecc4d

File tree

460 files changed

+32742
-20218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

460 files changed

+32742
-20218
lines changed

‎blocks/OSC/samples/BroadcastSender/src/BroadcastSenderApp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class BroadcastSenderApp : public App {
3030
};
3131

3232
BroadcastSenderApp::BroadcastSenderApp()
33-
: mSocket( new udp::socket( App::get()->io_service(), udp::endpoint( udp::v4(), localPort ) ) ),
33+
: mSocket( new udp::socket( App::get()->io_context(), udp::endpoint( udp::v4(), localPort ) ) ),
3434
// The endpoint that we want to "send" to is the v4 broadcast address.
3535
mSender( mSocket, udp::endpoint( address_v4::broadcast(), destinationPort ) )
3636
{

‎blocks/OSC/src/cinder/osc/Osc.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -951,13 +951,13 @@ void SenderBase::send( const Bundle &bundle, OnErrorFn onErrorFn, OnCompleteFn o
951951
////////////////////////////////////////////////////////////////////////////////////////
952952
//// SenderUdp
953953

954-
SenderUdp::SenderUdp( uint16_t localPort, const std::string &destinationHost, uint16_t destinationPort, const protocol &protocol, asio::io_service &service )
954+
SenderUdp::SenderUdp( uint16_t localPort, const std::string &destinationHost, uint16_t destinationPort, const protocol &protocol, asio::io_context &service )
955955
: mSocket( new udp::socket( service ) ), mLocalEndpoint( protocol, localPort ),
956956
mRemoteEndpoint( udp::endpoint( address::from_string( destinationHost ), destinationPort ) )
957957
{
958958
}
959959

960-
SenderUdp::SenderUdp( uint16_t localPort, const protocol::endpoint &destination, const protocol &protocol, asio::io_service &service )
960+
SenderUdp::SenderUdp( uint16_t localPort, const protocol::endpoint &destination, const protocol &protocol, asio::io_context &service )
961961
: mSocket( new udp::socket( service ) ), mLocalEndpoint( protocol, localPort ),
962962
mRemoteEndpoint( destination )
963963
{
@@ -1013,13 +1013,13 @@ void SenderUdp::closeImpl()
10131013
////////////////////////////////////////////////////////////////////////////////////////
10141014
//// SenderTcp
10151015

1016-
SenderTcp::SenderTcp( uint16_t localPort, const string &destinationHost, uint16_t destinationPort, const protocol &protocol, io_service &service, PacketFramingRef packetFraming )
1016+
SenderTcp::SenderTcp( uint16_t localPort, const string &destinationHost, uint16_t destinationPort, const protocol &protocol, io_context &service, PacketFramingRef packetFraming )
10171017
: mSocket( new tcp::socket( service ) ), mPacketFraming( packetFraming ), mLocalEndpoint( protocol, localPort ),
10181018
mRemoteEndpoint( tcp::endpoint( address::from_string( destinationHost ), destinationPort ) )
10191019
{
10201020
}
10211021

1022-
SenderTcp::SenderTcp( uint16_t localPort, const protocol::endpoint &destination, const protocol &protocol, io_service &service, PacketFramingRef packetFraming )
1022+
SenderTcp::SenderTcp( uint16_t localPort, const protocol::endpoint &destination, const protocol &protocol, io_context &service, PacketFramingRef packetFraming )
10231023
: mSocket( new tcp::socket( service ) ), mPacketFraming( packetFraming ), mLocalEndpoint( protocol, localPort ), mRemoteEndpoint( destination )
10241024
{
10251025
}
@@ -1311,12 +1311,12 @@ bool ReceiverBase::patternMatch( const std::string& lhs, const std::string& rhs
13111311
/////////////////////////////////////////////////////////////////////////////////////////
13121312
//// ReceiverUdp
13131313

1314-
ReceiverUdp::ReceiverUdp( uint16_t port, const asio::ip::udp &protocol, asio::io_service &service )
1314+
ReceiverUdp::ReceiverUdp( uint16_t port, const asio::ip::udp &protocol, asio::io_context &service )
13151315
: mSocket( new udp::socket( service ) ), mLocalEndpoint( protocol, port ), mAmountToReceive( 4096 )
13161316
{
13171317
}
13181318

1319-
ReceiverUdp::ReceiverUdp( const asio::ip::udp::endpoint &localEndpoint, asio::io_service &io )
1319+
ReceiverUdp::ReceiverUdp( const asio::ip::udp::endpoint &localEndpoint, asio::io_context &io )
13201320
: mSocket( new udp::socket( io ) ), mLocalEndpoint( localEndpoint ), mAmountToReceive( 4096 )
13211321
{
13221322
}
@@ -1487,13 +1487,13 @@ void ReceiverTcp::Connection::read()
14871487
});
14881488
}
14891489

1490-
ReceiverTcp::ReceiverTcp( uint16_t port, const protocol &protocol, asio::io_service &service, PacketFramingRef packetFraming )
1490+
ReceiverTcp::ReceiverTcp( uint16_t port, const protocol &protocol, asio::io_context &service, PacketFramingRef packetFraming )
14911491
: mAcceptor( new tcp::acceptor( service ) ), mPacketFraming( packetFraming ), mLocalEndpoint( protocol, port ),
14921492
mConnectionIdentifiers( 0 ), mIsShuttingDown( false )
14931493
{
14941494
}
14951495

1496-
ReceiverTcp::ReceiverTcp( const protocol::endpoint &localEndpoint, asio::io_service &service, PacketFramingRef packetFraming )
1496+
ReceiverTcp::ReceiverTcp( const protocol::endpoint &localEndpoint, asio::io_context &service, PacketFramingRef packetFraming )
14971497
: mAcceptor( new tcp::acceptor( service ) ), mPacketFraming( packetFraming ), mLocalEndpoint( localEndpoint ),
14981498
mConnectionIdentifiers( 0 ), mIsShuttingDown( false )
14991499
{
@@ -1542,7 +1542,7 @@ void ReceiverTcp::accept( OnAcceptErrorFn onAcceptErrorFn, OnAcceptFn onAcceptFn
15421542
if( ! mAcceptor || ! mAcceptor->is_open() )
15431543
return;
15441544

1545-
auto socket = std::make_shared<tcp::socket>( mAcceptor->get_io_service() );
1545+
auto socket = std::make_shared<tcp::socket>( mAcceptor->get_executor() );
15461546

15471547
mAcceptor->async_accept( *socket, std::bind(
15481548
[&, onAcceptErrorFn, onAcceptFn]( TcpSocketRef socket, const asio::error_code &error ) {

‎blocks/OSC/src/cinder/osc/Osc.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -502,19 +502,19 @@ class SenderUdp : public SenderBase {
502502
using protocol = asio::ip::udp;
503503
//! Constructs a Sender (called a \a server in the OSC spec) using UDP as transport, whose local endpoint is
504504
//! defined by \a localPort and \a protocol, which defaults to v4, and remote endpoint is defined by
505-
//! \a destinationHost and \a destinationPort. Takes an optional io_service, used to construct the socket from.
505+
//! \a destinationHost and \a destinationPort. Takes an optional io_context, used to construct the socket from.
506506
SenderUdp( uint16_t localPort,
507507
const std::string &destinationHost,
508508
uint16_t destinationPort,
509509
const protocol &protocol = protocol::v4(),
510-
asio::io_service &service = ci::app::App::get()->io_service() );
510+
asio::io_context &service = ci::app::App::get()->io_context() );
511511
//! Constructs a Sender (called a \a server in the OSC spec) using UDP as transport, whose local endpoint is
512512
//! defined by \a localPort and \a protocol, which defaults to v4, and remote endpoint is defined by \a
513-
//! destination. Takes an optional io_service, used to construct the socket from.
513+
//! destination. Takes an optional io_context, used to construct the socket from.
514514
SenderUdp( uint16_t localPort,
515515
const protocol::endpoint &destination,
516516
const protocol &protocol = protocol::v4(),
517-
asio::io_service &service = ci::app::App::get()->io_service() );
517+
asio::io_context &service = ci::app::App::get()->io_context() );
518518
//! Constructs a Sender (called a \a server in the OSC spec) using UDP for transport, with an already created
519519
//! udp::socket shared_ptr \a socket and remote endpoint \a destination. This constructor is good for using
520520
//! already constructed sockets for more indepth configuration. Expects the local endpoint to be constructed.
@@ -565,21 +565,21 @@ class SenderTcp : public SenderBase {
565565
//! Constructs a Sender (called a \a server in the OSC spec) using TCP as transport, whose local endpoint is
566566
//! defined by \a localPort and \a protocol, which defaults to v4, and remote endpoint is defined by \a
567567
//! destinationHost and \a destinationPort and PacketFraming shared_ptr \a packetFraming, which defaults to
568-
//! null. Takes an optional io_service to construct the socket from.
568+
//! null. Takes an optional io_context to construct the socket from.
569569
SenderTcp( uint16_t localPort,
570570
const std::string &destinationHost,
571571
uint16_t destinationPort,
572572
const protocol &protocol = protocol::v4(),
573-
asio::io_service &service = ci::app::App::get()->io_service(),
573+
asio::io_context &service = ci::app::App::get()->io_context(),
574574
PacketFramingRef packetFraming = nullptr );
575575
//! Constructs a Sender (called a \a server in the OSC spec) using TCP as transport, whose local endpoint is
576576
//! defined by \a localPort and \a protocol, which defaults to v4, and remote endpoint is defined by \a
577577
//! destination and PacketFraming shared_ptr \a packetFraming, which defaults to null. Takes an optional
578-
//! io_service to construct the socket from.
578+
//! io_context to construct the socket from.
579579
SenderTcp( uint16_t localPort,
580580
const protocol::endpoint &destination,
581581
const protocol &protocol = protocol::v4(),
582-
asio::io_service &service = ci::app::App::get()->io_service(),
582+
asio::io_context &service = ci::app::App::get()->io_context(),
583583
PacketFramingRef packetFraming = nullptr );
584584
//! Constructs a Sender (called a \a server in the OSC spec) using TCP as transport, with an already created
585585
//! tcp::socket shared_ptr \a socket, and remote endpoint is defined by \a destination and PacketFraming
@@ -694,15 +694,15 @@ class ReceiverUdp : public ReceiverBase {
694694
//! orginating endpoint if present. To see more about asio's error_codes, look at "asio/error.hpp".
695695
using OnSocketErrorFn = std::function<bool( asio::error_code /*error*/, protocol::endpoint /*originator*/)>;
696696
//! Constructs a Receiver (called a \a client in the OSC spec) using UDP for transport, whose local endpoint
697-
//! is defined by \a localPort and \a protocol, which defaults to v4. Takes an optional io_service to
697+
//! is defined by \a localPort and \a protocol, which defaults to v4. Takes an optional io_context to
698698
//! construct the socket from.
699699
ReceiverUdp( uint16_t port,
700700
const protocol &protocol = protocol::v4(),
701-
asio::io_service &io = ci::app::App::get()->io_service() );
701+
asio::io_context &io = ci::app::App::get()->io_context() );
702702
//! Constructs a Receiver (called a \a client in the OSC spec) using UDP for transport, whose local endpoint
703-
//! is defined by \a localEndpoint. Takes an optional io_service to construct the socket from.
703+
//! is defined by \a localEndpoint. Takes an optional io_context to construct the socket from.
704704
ReceiverUdp( const protocol::endpoint &localEndpoint,
705-
asio::io_service &io = ci::app::App::get()->io_service() );
705+
asio::io_context &io = ci::app::App::get()->io_context() );
706706
//! Constructs a Receiver (called a \a client in the OSC spec) using UDP for transport, from the already
707707
//! constructed udp::socket shared_ptr \a socket. Use this for extra configuration and or sharing sockets
708708
//! between sender and receiver.
@@ -766,17 +766,17 @@ class ReceiverTcp : public ReceiverBase {
766766
protocol::endpoint /*remote endpoint*/ )>;
767767
//! Constructs a Receiver (called a \a client in the OSC spec) using TCP for transport, whose
768768
//! local endpoint is defined by \a localPort and \a protocol, which defaults to v4, and
769-
//! PacketFraming shared_ptr \a packetFraming, which defaults to null. Takes an optional io_service
769+
//! PacketFraming shared_ptr \a packetFraming, which defaults to null. Takes an optional io_context
770770
//! to construct the socket from.
771771
ReceiverTcp( uint16_t port,
772772
const protocol &protocol = protocol::v4(),
773-
asio::io_service &service = ci::app::App::get()->io_service(),
773+
asio::io_context &service = ci::app::App::get()->io_context(),
774774
PacketFramingRef packetFraming = nullptr );
775775
//! Constructs a Receiver (called a \a client in the OSC spec) using TCP for transport, whose local endpoint
776776
//! is defined by \a localEndpoint and PacketFraming shared_ptr \a packetFraming, which defaults to null. Takes
777-
//! an optional io_service to construct the socket from.
777+
//! an optional io_context to construct the socket from.
778778
ReceiverTcp( const protocol::endpoint &localEndpoint,
779-
asio::io_service &service = ci::app::App::get()->io_service(),
779+
asio::io_context &service = ci::app::App::get()->io_context(),
780780
PacketFramingRef packetFraming = nullptr );
781781
//! Constructs a Receiver (called a \a client in the OSC spec) using TCP for transport, from the already
782782
//! constructed tcp::acceptor shared_ptr \a acceptor and PacketFraming shared_ptr \a packetFraming, which

‎include/asio/asio.hpp‎

Lines changed: 64 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// asio.hpp
33
// ~~~~~~~~
44
//
5-
// Copyright (c) 2003-2015 Christopher M. Kohlhoff (chris at kohlhoff dot com)
5+
// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com)
66
//
77
// Distributed under the Boost Software License, Version 1.0. (See accompanying
88
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,19 +18,22 @@
1818
#include "asio/associated_allocator.hpp"
1919
#include "asio/associated_executor.hpp"
2020
#include "asio/async_result.hpp"
21+
#include "asio/awaitable.hpp"
2122
#include "asio/basic_datagram_socket.hpp"
2223
#include "asio/basic_deadline_timer.hpp"
2324
#include "asio/basic_io_object.hpp"
2425
#include "asio/basic_raw_socket.hpp"
2526
#include "asio/basic_seq_packet_socket.hpp"
2627
#include "asio/basic_serial_port.hpp"
2728
#include "asio/basic_signal_set.hpp"
29+
#include "asio/basic_socket.hpp"
2830
#include "asio/basic_socket_acceptor.hpp"
2931
#include "asio/basic_socket_iostream.hpp"
3032
#include "asio/basic_socket_streambuf.hpp"
3133
#include "asio/basic_stream_socket.hpp"
3234
#include "asio/basic_streambuf.hpp"
3335
#include "asio/basic_waitable_timer.hpp"
36+
#include "asio/bind_executor.hpp"
3437
#include "asio/buffer.hpp"
3538
#include "asio/buffered_read_stream_fwd.hpp"
3639
#include "asio/buffered_read_stream.hpp"
@@ -39,19 +42,48 @@
3942
#include "asio/buffered_write_stream_fwd.hpp"
4043
#include "asio/buffered_write_stream.hpp"
4144
#include "asio/buffers_iterator.hpp"
45+
#include "asio/co_spawn.hpp"
4246
#include "asio/completion_condition.hpp"
47+
#include "asio/compose.hpp"
4348
#include "asio/connect.hpp"
4449
#include "asio/coroutine.hpp"
45-
#include "asio/datagram_socket_service.hpp"
46-
#include "asio/deadline_timer_service.hpp"
4750
#include "asio/deadline_timer.hpp"
4851
#include "asio/defer.hpp"
52+
#include "asio/detached.hpp"
4953
#include "asio/dispatch.hpp"
5054
#include "asio/error.hpp"
5155
#include "asio/error_code.hpp"
56+
#include "asio/execution.hpp"
57+
#include "asio/execution/allocator.hpp"
58+
#include "asio/execution/any_executor.hpp"
59+
#include "asio/execution/blocking.hpp"
60+
#include "asio/execution/blocking_adaptation.hpp"
61+
#include "asio/execution/bulk_execute.hpp"
62+
#include "asio/execution/bulk_guarantee.hpp"
63+
#include "asio/execution/connect.hpp"
64+
#include "asio/execution/context.hpp"
65+
#include "asio/execution/context_as.hpp"
66+
#include "asio/execution/execute.hpp"
67+
#include "asio/execution/executor.hpp"
68+
#include "asio/execution/invocable_archetype.hpp"
69+
#include "asio/execution/mapping.hpp"
70+
#include "asio/execution/occupancy.hpp"
71+
#include "asio/execution/operation_state.hpp"
72+
#include "asio/execution/outstanding_work.hpp"
73+
#include "asio/execution/prefer_only.hpp"
74+
#include "asio/execution/receiver.hpp"
75+
#include "asio/execution/receiver_invocation_error.hpp"
76+
#include "asio/execution/relationship.hpp"
77+
#include "asio/execution/schedule.hpp"
78+
#include "asio/execution/scheduler.hpp"
79+
#include "asio/execution/sender.hpp"
80+
#include "asio/execution/set_done.hpp"
81+
#include "asio/execution/set_error.hpp"
82+
#include "asio/execution/set_value.hpp"
83+
#include "asio/execution/start.hpp"
5284
#include "asio/execution_context.hpp"
5385
#include "asio/executor.hpp"
54-
#include "asio/executor_work.hpp"
86+
#include "asio/executor_work_guard.hpp"
5587
#include "asio/generic/basic_endpoint.hpp"
5688
#include "asio/generic/datagram_protocol.hpp"
5789
#include "asio/generic/raw_protocol.hpp"
@@ -60,14 +92,20 @@
6092
#include "asio/handler_alloc_hook.hpp"
6193
#include "asio/handler_continuation_hook.hpp"
6294
#include "asio/handler_invoke_hook.hpp"
63-
#include "asio/handler_type.hpp"
95+
#include "asio/high_resolution_timer.hpp"
96+
#include "asio/io_context.hpp"
97+
#include "asio/io_context_strand.hpp"
6498
#include "asio/io_service.hpp"
6599
#include "asio/io_service_strand.hpp"
66100
#include "asio/ip/address.hpp"
67-
#include "asio/ip/address_iterator_v4.hpp"
68-
#include "asio/ip/address_range_v4.hpp"
69101
#include "asio/ip/address_v4.hpp"
102+
#include "asio/ip/address_v4_iterator.hpp"
103+
#include "asio/ip/address_v4_range.hpp"
70104
#include "asio/ip/address_v6.hpp"
105+
#include "asio/ip/address_v6_iterator.hpp"
106+
#include "asio/ip/address_v6_range.hpp"
107+
#include "asio/ip/network_v4.hpp"
108+
#include "asio/ip/network_v6.hpp"
71109
#include "asio/ip/bad_address_cast.hpp"
72110
#include "asio/ip/basic_endpoint.hpp"
73111
#include "asio/ip/basic_resolver.hpp"
@@ -77,62 +115,67 @@
77115
#include "asio/ip/host_name.hpp"
78116
#include "asio/ip/icmp.hpp"
79117
#include "asio/ip/multicast.hpp"
118+
#include "asio/ip/resolver_base.hpp"
80119
#include "asio/ip/resolver_query_base.hpp"
81-
#include "asio/ip/resolver_service.hpp"
82120
#include "asio/ip/tcp.hpp"
83121
#include "asio/ip/udp.hpp"
84122
#include "asio/ip/unicast.hpp"
85123
#include "asio/ip/v6_only.hpp"
124+
#include "asio/is_applicable_property.hpp"
86125
#include "asio/is_executor.hpp"
87126
#include "asio/is_read_buffered.hpp"
88127
#include "asio/is_write_buffered.hpp"
89128
#include "asio/local/basic_endpoint.hpp"
90129
#include "asio/local/connect_pair.hpp"
91130
#include "asio/local/datagram_protocol.hpp"
92131
#include "asio/local/stream_protocol.hpp"
132+
#include "asio/multiple_exceptions.hpp"
133+
#include "asio/packaged_task.hpp"
93134
#include "asio/placeholders.hpp"
94135
#include "asio/posix/basic_descriptor.hpp"
95136
#include "asio/posix/basic_stream_descriptor.hpp"
137+
#include "asio/posix/descriptor.hpp"
96138
#include "asio/posix/descriptor_base.hpp"
97139
#include "asio/posix/stream_descriptor.hpp"
98-
#include "asio/posix/stream_descriptor_service.hpp"
99140
#include "asio/post.hpp"
100-
#include "asio/raw_socket_service.hpp"
141+
#include "asio/prefer.hpp"
142+
#include "asio/query.hpp"
101143
#include "asio/read.hpp"
102144
#include "asio/read_at.hpp"
103145
#include "asio/read_until.hpp"
104-
#include "asio/seq_packet_socket_service.hpp"
146+
#include "asio/redirect_error.hpp"
147+
#include "asio/require.hpp"
148+
#include "asio/require_concept.hpp"
105149
#include "asio/serial_port.hpp"
106150
#include "asio/serial_port_base.hpp"
107-
#include "asio/serial_port_service.hpp"
108151
#include "asio/signal_set.hpp"
109-
#include "asio/signal_set_service.hpp"
110-
#include "asio/socket_acceptor_service.hpp"
111152
#include "asio/socket_base.hpp"
153+
#include "asio/static_thread_pool.hpp"
154+
#include "asio/steady_timer.hpp"
112155
#include "asio/strand.hpp"
113-
#include "asio/stream_socket_service.hpp"
114156
#include "asio/streambuf.hpp"
157+
#include "asio/system_context.hpp"
115158
#include "asio/system_error.hpp"
116159
#include "asio/system_executor.hpp"
160+
#include "asio/system_timer.hpp"
161+
#include "asio/this_coro.hpp"
117162
#include "asio/thread.hpp"
118163
#include "asio/thread_pool.hpp"
119164
#include "asio/time_traits.hpp"
165+
#include "asio/use_awaitable.hpp"
166+
#include "asio/use_future.hpp"
120167
#include "asio/uses_executor.hpp"
121168
#include "asio/version.hpp"
122169
#include "asio/wait_traits.hpp"
123-
#include "asio/waitable_timer_service.hpp"
124-
#include "asio/windows/basic_handle.hpp"
125170
#include "asio/windows/basic_object_handle.hpp"
171+
#include "asio/windows/basic_overlapped_handle.hpp"
126172
#include "asio/windows/basic_random_access_handle.hpp"
127173
#include "asio/windows/basic_stream_handle.hpp"
128174
#include "asio/windows/object_handle.hpp"
129-
#include "asio/windows/object_handle_service.hpp"
175+
#include "asio/windows/overlapped_handle.hpp"
130176
#include "asio/windows/overlapped_ptr.hpp"
131177
#include "asio/windows/random_access_handle.hpp"
132-
#include "asio/windows/random_access_handle_service.hpp"
133178
#include "asio/windows/stream_handle.hpp"
134-
#include "asio/windows/stream_handle_service.hpp"
135-
#include "asio/wrap.hpp"
136179
#include "asio/write.hpp"
137180
#include "asio/write_at.hpp"
138181

0 commit comments

Comments
 (0)