diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2018-01-06 14:18:38 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2018-01-06 14:18:38 +0000 |
commit | b6faaf846e22941bf90ee366df87086b3e79cd19 (patch) | |
tree | 4c78ae1b90c90390427d52c7f559741de7e160f6 /net/libproxy/files/patch-libproxy_test_get-pac-test.cpp | |
parent | audio/festival: unbreak build with Clang 6 (C++14 by default) (diff) |
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)
Notes
Notes:
svn path=/head/; revision=458272
Diffstat (limited to 'net/libproxy/files/patch-libproxy_test_get-pac-test.cpp')
-rw-r--r-- | net/libproxy/files/patch-libproxy_test_get-pac-test.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp b/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp new file mode 100644 index 000000000000..963f8f56b6f8 --- /dev/null +++ b/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp @@ -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); |