Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-05-08 08:29:22 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-05-08 08:29:22 (GMT) |
| commit | 85c1484a546d484819254230319f9ff09169aa9b (patch) | |
| tree | f07e3147663736ee7070cc7955a28a2d5b315fc8 /3rdParty | |
| parent | 5616ff49792238b451486f41b187744866d20056 (diff) | |
| download | swift-85c1484a546d484819254230319f9ff09169aa9b.zip swift-85c1484a546d484819254230319f9ff09169aa9b.tar.bz2 | |
Fixed another Boost Asio warning.
Diffstat (limited to '3rdParty')
| -rw-r--r-- | 3rdParty/Boost/3_fix_asio_warning.diff | 13 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/asio/detail/epoll_reactor.hpp | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/3rdParty/Boost/3_fix_asio_warning.diff b/3rdParty/Boost/3_fix_asio_warning.diff new file mode 100644 index 0000000..207e0e9 --- /dev/null +++ b/3rdParty/Boost/3_fix_asio_warning.diff @@ -0,0 +1,13 @@ +diff --git a/3rdParty/Boost/src/boost/asio/detail/epoll_reactor.hpp b/3rdParty/Boost/src/boost/asio/detail/epoll_reactor.hpp +index 4684944..40cc3aa 100644 +--- a/3rdParty/Boost/src/boost/asio/detail/epoll_reactor.hpp ++++ b/3rdParty/Boost/src/boost/asio/detail/epoll_reactor.hpp +@@ -208,7 +208,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, per_descriptor_data& descriptor_data) + { + mutex::scoped_lock descriptor_lock(descriptor_data->mutex_); + diff --git a/3rdParty/Boost/src/boost/asio/detail/epoll_reactor.hpp b/3rdParty/Boost/src/boost/asio/detail/epoll_reactor.hpp index 4684944..40cc3aa 100644 --- a/3rdParty/Boost/src/boost/asio/detail/epoll_reactor.hpp +++ b/3rdParty/Boost/src/boost/asio/detail/epoll_reactor.hpp @@ -208,7 +208,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, per_descriptor_data& descriptor_data) { mutex::scoped_lock descriptor_lock(descriptor_data->mutex_); |