svn commit: r458272 - head/net/libproxy/files

Jan Beich jbeich at FreeBSD.org
Sat Jan 6 14:18:40 UTC 2018


Author: jbeich
Date: Sat Jan  6 14:18:38 2018
New Revision: 458272
URL: https://svnweb.freebsd.org/changeset/ports/458272

Log:
  net/libproxy: unbreak build with Clang 6 (C++14 by default)
  
  libproxy/test/get-pac-test.cpp:48:10: error: assigning to 'int' from incompatible type '__bind<int &, sockaddr *, unsigned long>'
                          ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in));
                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  Reported by:	antoine (via bug 224669)

Added:
  head/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp   (contents, props changed)

Added: head/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp	Sat Jan  6 14:18:38 2018	(r458272)
@@ -0,0 +1,17 @@
+libc++ doesn't like "using namespace std" in C++11
+
+libproxy/test/get-pac-test.cpp:48:10: error: assigning to 'int' from incompatible type '__bind<int &, sockaddr *, unsigned long>'
+                        ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in));
+                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+--- libproxy/test/get-pac-test.cpp.orig	2016-01-12 16:41:07 UTC
++++ libproxy/test/get-pac-test.cpp
+@@ -45,7 +45,7 @@ class TestServer {
+ 
+ 			setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
+ 
+-			ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in));
++			ret = ::bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in));
+ 			assert(!ret);
+ 
+ 			ret = listen(m_sock, 1);


More information about the svn-ports-head mailing list