From owner-svn-ports-all@freebsd.org Thu Jul 5 10:31:37 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D1C5103EE6F; Thu, 5 Jul 2018 10:31:37 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B681F7435E; Thu, 5 Jul 2018 10:31:36 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9944018BCE; Thu, 5 Jul 2018 10:31:36 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w65AVap7057561; Thu, 5 Jul 2018 10:31:36 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w65AVaEb057558; Thu, 5 Jul 2018 10:31:36 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201807051031.w65AVaEb057558@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Thu, 5 Jul 2018 10:31:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473961 - head/www/sams2/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/www/sams2/files X-SVN-Commit-Revision: 473961 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jul 2018 10:31:37 -0000 Author: adridg Date: Thu Jul 5 10:31:35 2018 New Revision: 473961 URL: https://svnweb.freebsd.org/changeset/ports/473961 Log: Fix build with Clang6. error: invalid operands to binary expression ('std::ostream' (aka 'basic_ostream') and 'std::stringstream' (aka 'basic_stringstream')) Reported by: linimon Added: head/www/sams2/files/patch-src_datefilter.cpp (contents, props changed) head/www/sams2/files/patch-src_net.cpp (contents, props changed) Added: head/www/sams2/files/patch-src_datefilter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/sams2/files/patch-src_datefilter.cpp Thu Jul 5 10:31:35 2018 (r473961) @@ -0,0 +1,29 @@ +Fix build with Clang6: stringstream doesn't have a viable overload +for ostream::operator<< . It does with Clang5. Use str() explicitly. + +--- src/datefilter.cpp.orig 2018-07-04 11:23:09 UTC ++++ src/datefilter.cpp +@@ -130,9 +130,10 @@ string DateFilter::getStartDateAsString () const + strftime (strbuf, sizeof (strbuf), "%Y-%m-%d", localtime (&_date_start)); + s << strbuf; + +- DEBUG (DEBUG8, "[" << this << "->" << __FUNCTION__ << "] = " << s); ++ string r = s.str (); ++ DEBUG (DEBUG8, "[" << this << "->" << __FUNCTION__ << "] = " << r); + +- return s.str (); ++ return r; + } + + string DateFilter::getEndDateAsString () const +@@ -143,7 +144,8 @@ string DateFilter::getEndDateAsString () const + strftime (strbuf, sizeof (strbuf), "%Y-%m-%d", localtime (&_date_end)); + s << strbuf; + +- DEBUG (DEBUG8, "[" << this << "->" << __FUNCTION__ << "] = " << s); ++ string r = s.str (); ++ DEBUG (DEBUG8, "[" << this << "->" << __FUNCTION__ << "] = " << r); + +- return s.str (); ++ return r; + } Added: head/www/sams2/files/patch-src_net.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/sams2/files/patch-src_net.cpp Thu Jul 5 10:31:35 2018 (r473961) @@ -0,0 +1,18 @@ +Fix build with Clang6: stringstream doesn't have a viable overload +for ostream::operator<< . It does with Clang5. Use str() explicitly. + +--- src/net.cpp.orig 2018-07-04 11:24:43 UTC ++++ src/net.cpp +@@ -156,9 +156,10 @@ string Net::asString () + + s << _net.c_str (); + +- DEBUG (DEBUG8, "[" << this << "->" << __FUNCTION__ << "] = " << s); ++ string r = s.str (); ++ DEBUG (DEBUG8, "[" << this << "->" << __FUNCTION__ << "] = " << r); + +- return s.str (); ++ return r; + } + +