diff options
| author | gnieboer <gnieboer@corpcomm.net> | 2016-08-09 23:28:21 -0400 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-16 08:39:41 -0700 |
| commit | e1fdc200c7ec6613e033c2b6be2179364af5366b (patch) | |
| tree | b3b7380bf497599770b733e0816383f381a5ab24 | |
| parent | ee6f4e343e31d141d4e303b1c27c9743953fc396 (diff) | |
renames s_host to s__host as already #defined in win32
| -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); |