Date: Sat, 6 Jan 2018 05:39:32 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458222 - branches/2018Q1/net/libutp/files Message-ID: <201801060539.w065dWTx004646@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Jan 6 05:39:32 2018 New Revision: 458222 URL: https://svnweb.freebsd.org/changeset/ports/458222 Log: MFH: r458221 net/libutp: unbreak build with Clang 6 (C++14 by default) c++ -O2 -pipe -fstack-protector -fno-strict-aliasing -fno-exceptions -fno-rtti -I/wrkdirs/usr/ports/net/libutp/work/libutp-7c4f19a -I/wrkdirs/usr/ports/net/libutp/work/libutp-7c4f19a/utp_config_lib -DPOSIX -Wall -Wno-c++11-extensions -c utp.cpp -o utp.o utp.cpp:1708:91: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] "scaled_gain:%f rtt:%u rate:%u quota:%d wnduser:%u rto:%u timeout:%d get_microseconds:"I64u" " ^ utp.cpp:1793:79: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] LOG_UTPV("0x%08x: Got %s. seq_nr:%u ack_nr:%u state:%s version:%u timestamp:"I64u" reply_micro:%u", ^ Reported by: antoine (via bug 224669) Approved by: ports-secteam blanket Added: branches/2018Q1/net/libutp/files/patch-c++11 - copied unchanged from r458221, head/net/libutp/files/patch-c++11 Modified: Directory Properties: branches/2018Q1/ (props changed) Copied: branches/2018Q1/net/libutp/files/patch-c++11 (from r458221, head/net/libutp/files/patch-c++11) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/net/libutp/files/patch-c++11 Sat Jan 6 05:39:32 2018 (r458222, copy of r458221, head/net/libutp/files/patch-c++11) @@ -0,0 +1,20 @@ +--- utp.cpp.orig 2013-05-14 23:05:36 UTC ++++ utp.cpp +@@ -1698,7 +1698,7 @@ void UTPSocket::apply_ledbat_ccontrol(size_t bytes_ack + // used in parse_log.py + LOG_UTP("0x%08x: actual_delay:%u our_delay:%d their_delay:%u off_target:%d max_window:%u " + "delay_base:%u delay_sum:%d target_delay:%d acked_bytes:%u cur_window:%u " +- "scaled_gain:%f rtt:%u rate:%u quota:%d wnduser:%u rto:%u timeout:%d get_microseconds:"I64u" " ++ "scaled_gain:%f rtt:%u rate:%u quota:%d wnduser:%u rto:%u timeout:%d get_microseconds:" I64u " " + "cur_window_packets:%u packet_size:%u their_delay_base:%u their_actual_delay:%u", + this, actual_delay, our_delay / 1000, their_hist.get_value() / 1000, + (int)off_target / 1000, (uint)(max_window), our_hist.delay_base, +@@ -1783,7 +1783,7 @@ size_t UTP_ProcessIncoming(UTPSocket *conn, const byte + + if (pk_flags >= ST_NUM_STATES) return 0; + +- LOG_UTPV("0x%08x: Got %s. seq_nr:%u ack_nr:%u state:%s version:%u timestamp:"I64u" reply_micro:%u", ++ LOG_UTPV("0x%08x: Got %s. seq_nr:%u ack_nr:%u state:%s version:%u timestamp:" I64u " reply_micro:%u", + conn, flagnames[pk_flags], pk_seq_nr, pk_ack_nr, statenames[conn->state], conn->version, + conn->version == 0?(uint64)(pf->tv_sec) * 1000000 + pf->tv_usec:uint64(pf1->tv_usec), + conn->version == 0?(uint32)(pf->reply_micro):(uint32)(pf1->reply_micro));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801060539.w065dWTx004646>