summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-05-07 18:35:55 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-05-07 18:45:29 (GMT)
commit61620db053088fac637799b27f04efa44d0bcc6b (patch)
tree39bee9e5a3563f0692f405f5580ef95a3a12b6b2
parent769f83f3186eebfab06174c20700cdd6db802e1b (diff)
downloadswift-61620db053088fac637799b27f04efa44d0bcc6b.zip
swift-61620db053088fac637799b27f04efa44d0bcc6b.tar.bz2
Fixed Boost Asio warning.
-rw-r--r--3rdParty/Boost/2_fix_asio_warning.diff13
-rw-r--r--3rdParty/Boost/src/boost/asio/detail/kqueue_reactor.hpp2
2 files changed, 14 insertions, 1 deletions
diff --git a/3rdParty/Boost/2_fix_asio_warning.diff b/3rdParty/Boost/2_fix_asio_warning.diff
new file mode 100644
index 0000000..1fc83b3
--- /dev/null
+++ b/3rdParty/Boost/2_fix_asio_warning.diff
@@ -0,0 +1,13 @@
+diff --git a/3rdParty/Boost/src/boost/asio/detail/kqueue_reactor.hpp b/3rdParty/Boost/src/boost/asio/detail/kqueue_reactor.hpp
+index c1a6705..f33c985 100644
+--- a/3rdParty/Boost/src/boost/asio/detail/kqueue_reactor.hpp
++++ b/3rdParty/Boost/src/boost/asio/detail/kqueue_reactor.hpp
+@@ -206,7 +206,7 @@ public:
+ // Cancel all operations associated with the given descriptor. The
+ // handlers associated with the descriptor will be invoked with the
+ // operation_aborted error.
+- void cancel_ops(socket_type descriptor, per_descriptor_data& descriptor_data)
++ void cancel_ops(socket_type /*descriptor*/, per_descriptor_data& descriptor_data)
+ {
+ mutex::scoped_lock descriptor_lock(descriptor_data->mutex_);
+
diff --git a/3rdParty/Boost/src/boost/asio/detail/kqueue_reactor.hpp b/3rdParty/Boost/src/boost/asio/detail/kqueue_reactor.hpp
index c1a6705..f33c985 100644
--- a/3rdParty/Boost/src/boost/asio/detail/kqueue_reactor.hpp
+++ b/3rdParty/Boost/src/boost/asio/detail/kqueue_reactor.hpp
@@ -206,7 +206,7 @@ public:
// Cancel all operations associated with the given descriptor. The
// handlers associated with the descriptor will be invoked with the
// operation_aborted error.
- void cancel_ops(socket_type descriptor, per_descriptor_data& descriptor_data)
+ void cancel_ops(socket_type /*descriptor*/, per_descriptor_data& descriptor_data)
{
mutex::scoped_lock descriptor_lock(descriptor_data->mutex_);