diff options
author | Sebastian Koslowski <koslowski@kit.edu> | 2016-09-12 14:16:50 -0600 |
---|---|---|
committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-09-12 14:19:29 -0600 |
commit | f7cdfff6a85ce52b1d7c0b5131645fcb77405fe8 (patch) | |
tree | 908af9bf8d1c512e22116cb3afbc89eb5883cc93 /gr-blocks/lib/tcp_server_sink_impl.cc | |
parent | a867a290194228d09ba93f0f46e3a4e4523f5396 (diff) | |
parent | af4323d1e471476efa255e3df745397f7c8a1b71 (diff) |
Merge remote-tracking branch 'upstream/next' into gtk3
Diffstat (limited to 'gr-blocks/lib/tcp_server_sink_impl.cc')
-rw-r--r-- | gr-blocks/lib/tcp_server_sink_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-blocks/lib/tcp_server_sink_impl.cc b/gr-blocks/lib/tcp_server_sink_impl.cc index 329e798ca8..44f0765cb2 100644 --- a/gr-blocks/lib/tcp_server_sink_impl.cc +++ b/gr-blocks/lib/tcp_server_sink_impl.cc @@ -58,10 +58,10 @@ namespace gr { d_buf(new uint8_t[BUF_SIZE]), d_writing(0) { - std::string s_port = (boost::format("%d") % port).str(); - std::string s_host = host.empty() ? std::string("localhost") : host; + std::string s__port = (boost::format("%d") % port).str(); + std::string s__host = host.empty() ? std::string("localhost") : host; boost::asio::ip::tcp::resolver resolver(d_io_service); - boost::asio::ip::tcp::resolver::query query(s_host, s_port, + boost::asio::ip::tcp::resolver::query query(s__host, s__port, boost::asio::ip::resolver_query_base::passive); d_endpoint = *resolver.resolve(query); |