[Commit-gnuradio] [gnuradio] 05/08: renames s_host to s__host as already #defined in win32

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit e1fdc200c7ec6613e033c2b6be2179364af5366b
Author: gnieboer <address@hidden>
Date:   Tue Aug 9 23:28:21 2016 -0400

    renames s_host to s__host as already #defined in win32
---
 gr-blocks/lib/tcp_server_sink_impl.cc | 6 +++---
 1 file 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 329e798..44f0765 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);