[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 05/08: renames s_host to s__host as already
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 05/08: renames s_host to s__host as already #defined in win32 |
Date: |
Tue, 16 Aug 2016 16:24:33 +0000 (UTC) |
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);
- [Commit-gnuradio] [gnuradio] branch master updated (0bfbc97 -> f65a6f2), git, 2016/08/16
- [Commit-gnuradio] [gnuradio] 05/08: renames s_host to s__host as already #defined in win32,
git <=
- [Commit-gnuradio] [gnuradio] 07/08: Merge remote-tracking branch 'jgilbert/pdu_setters', git, 2016/08/16
- [Commit-gnuradio] [gnuradio] 04/08: Merge branch 'maint', git, 2016/08/16
- [Commit-gnuradio] [gnuradio] 01/08: gr-dtv: Replace DVB-T Reed-Solomon with existing implementation in gr-fec., git, 2016/08/16
- [Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'sbmueller/modtool_docs', git, 2016/08/16
- [Commit-gnuradio] [gnuradio] 03/08: modtool: update python docstring generation, git, 2016/08/16
- [Commit-gnuradio] [gnuradio] 06/08: Merge remote-tracking branch 'drmpeg/rs-replace', git, 2016/08/16
- [Commit-gnuradio] [gnuradio] 02/08: Addition of PDU block setters: added setters for the pdu metadata manipulation blocks pdu_filter, pdu_remove, and pdu_set and associated GRC files., git, 2016/08/16