boost/asio/detail/impl/kqueue_reactor.ipp.diff000644 011031 000145 00000002637 11477474634 023024 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/detail/impl/kqueue_reactor.ipp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/impl/kqueue_reactor.ipp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98043.45 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/impl/kqueue_reactor.ipp 2010-12-06 13:21:25.000000000 -0500 @@ -30,9 +30,9 @@ namespace asio { namespace detail { -kqueue_reactor::kqueue_reactor(boost::asio::io_service& io_service) - : boost::asio::detail::service_base(io_service), - io_service_(use_service(io_service)), +kqueue_reactor::kqueue_reactor(boost::asio::io_service& io_service_arg) + : boost::asio::detail::service_base(io_service_arg), + io_service_(use_service(io_service_arg)), mutex_(), kqueue_fd_(do_kqueue_create()), interrupter_(), @@ -76,6 +76,8 @@ int kqueue_reactor::register_descriptor(socket_type descriptor, kqueue_reactor::per_descriptor_data& descriptor_data) { + (void) descriptor; + mutex::scoped_lock lock(registered_descriptors_mutex_); descriptor_data = registered_descriptors_.alloc(); @@ -181,6 +183,8 @@ void kqueue_reactor::close_descriptor(socket_type descriptor, kqueue_reactor::per_descriptor_data& descriptor_data) { + (void) descriptor; + if (!descriptor_data) return; boost/asio/detail/impl/socket_ops.ipp.diff000644 011031 000145 00000003773 11477474634 022161 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/detail/impl/socket_ops.ipp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/impl/socket_ops.ipp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98046.41 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/impl/socket_ops.ipp 2010-12-06 13:21:25.000000000 -0500 @@ -312,11 +312,11 @@ clear_last_error(); #if defined(BOOST_WINDOWS) || defined(__CYGWIN__) - int result = error_wrapper(::closesocket(s), ec); + int close_result = error_wrapper(::closesocket(s), ec); #else // defined(BOOST_WINDOWS) || defined(__CYGWIN__) - int result = error_wrapper(::close(s), ec); + int close_result = error_wrapper(::close(s), ec); #endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__) - if (result == 0) + if (close_result == 0) ec = boost::system::error_code(); } @@ -2500,7 +2500,7 @@ const char* addr; size_t addr_len; unsigned short port; - switch (sa->sa_family) + switch (sa->sfamily_arg) { case AF_INET: if (salen != sizeof(sockaddr_in4_type)) @@ -2530,7 +2530,7 @@ { if (flags & NI_NUMERICHOST) { - if (socket_ops::inet_ntop(sa->sa_family, addr, host, hostlen, 0, ec) == 0) + if (socket_ops::inet_ntop(sa->sfamily_arg, addr, host, hostlen, 0, ec) == 0) { return ec; } @@ -2540,7 +2540,7 @@ hostent hent; char hbuf[8192] = ""; hostent* hptr = socket_ops::gethostbyaddr(addr, - static_cast(addr_len), sa->sa_family, + static_cast(addr_len), sa->sfamily_arg, &hent, hbuf, sizeof(hbuf), ec); if (hptr && hptr->h_name && hptr->h_name[0] != '\0') { @@ -2562,7 +2562,7 @@ { return ec = boost::asio::error::host_not_found; } - if (socket_ops::inet_ntop(sa->sa_family, + if (socket_ops::inet_ntop(sa->sfamily_arg, addr, host, hostlen, 0, ec) == 0) { return ec; boost/asio/detail/impl/strand_service.ipp.diff000644 011031 000145 00000001606 11477474634 023014 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/detail/impl/strand_service.ipp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/impl/strand_service.ipp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98049.88 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/impl/strand_service.ipp 2010-12-06 13:21:25.000000000 -0500 @@ -41,9 +41,9 @@ } }; -strand_service::strand_service(boost::asio::io_service& io_service) - : boost::asio::detail::service_base(io_service), - io_service_(boost::asio::use_service(io_service)), +strand_service::strand_service(boost::asio::io_service& io_service_arg) + : boost::asio::detail::service_base(io_service_arg), + io_service_(boost::asio::use_service(io_service_arg)), mutex_(), salt_(0) { boost/asio/detail/impl/task_io_service.ipp.diff000644 011031 000145 00000001453 11477474634 023152 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/detail/impl/task_io_service.ipp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/impl/task_io_service.ipp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98052.62 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/impl/task_io_service.ipp 2010-12-06 13:21:25.000000000 -0500 @@ -64,8 +64,8 @@ idle_thread_info* next; }; -task_io_service::task_io_service(boost::asio::io_service& io_service) - : boost::asio::detail::service_base(io_service), +task_io_service::task_io_service(boost::asio::io_service& io_service_arg) + : boost::asio::detail::service_base(io_service_arg), mutex_(), task_(0), task_interrupted_(true), boost/asio/detail/buffer_sequence_adapter.hpp.diff000644 011031 000145 00000003545 11477474634 023704 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/detail/buffer_sequence_adapter.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/buffer_sequence_adapter.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98034.94 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/buffer_sequence_adapter.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -81,11 +81,11 @@ : buffer_sequence_adapter_base { public: - explicit buffer_sequence_adapter(const Buffers& buffers) + explicit buffer_sequence_adapter(const Buffers& buffers_arg) : count_(0), total_buffer_size_(0) { - typename Buffers::const_iterator iter = buffers.begin(); - typename Buffers::const_iterator end = buffers.end(); + typename Buffers::const_iterator iter = buffers_arg.begin(); + typename Buffers::const_iterator end = buffers_arg.end(); for (; iter != end && count_ < max_buffers; ++iter, ++count_) { Buffer buffer(*iter); @@ -159,10 +159,10 @@ { public: explicit buffer_sequence_adapter( - const boost::asio::mutable_buffers_1& buffers) + const boost::asio::mutable_buffers_1& buffers_arg) { - init_native_buffer(buffer_, buffers); - total_buffer_size_ = boost::asio::buffer_size(buffers); + init_native_buffer(buffer_, buffers_arg); + total_buffer_size_ = boost::asio::buffer_size(buffers_arg); } native_buffer_type* buffers() @@ -206,10 +206,10 @@ { public: explicit buffer_sequence_adapter( - const boost::asio::const_buffers_1& buffers) + const boost::asio::const_buffers_1& buffers_arg) { - init_native_buffer(buffer_, buffers); - total_buffer_size_ = boost::asio::buffer_size(buffers); + init_native_buffer(buffer_, buffers_arg); + total_buffer_size_ = boost::asio::buffer_size(buffers_arg); } native_buffer_type* buffers() boost/asio/detail/buffered_stream_storage.hpp.diff000644 011031 000145 00000001332 11477474634 023714 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/detail/buffered_stream_storage.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/buffered_stream_storage.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98037.47 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/buffered_stream_storage.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -37,10 +37,10 @@ typedef std::size_t size_type; // Constructor. - explicit buffered_stream_storage(std::size_t capacity) + explicit buffered_stream_storage(std::size_t capacity_arg) : begin_offset_(0), end_offset_(0), - buffer_(capacity) + buffer_(capacity_arg) { } boost/asio/detail/deadline_timer_service.hpp.diff000644 011031 000145 00000001472 11477474634 023525 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/detail/deadline_timer_service.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/deadline_timer_service.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98040.48 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/deadline_timer_service.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -147,8 +147,8 @@ ::timeval tv; tv.tv_sec = timeout.total_seconds(); tv.tv_usec = timeout.total_microseconds() % 1000000; - boost::system::error_code ec; - socket_ops::select(0, 0, 0, 0, &tv, ec); + boost::system::error_code select_ec; + socket_ops::select(0, 0, 0, 0, &tv, select_ec); now = Time_Traits::now(); } ec = boost::system::error_code(); boost/asio/detail/io_control.hpp.diff000644 011031 000145 00000001075 11477474634 021206 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/detail/io_control.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/io_control.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98055.12 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/io_control.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -46,7 +46,7 @@ // Get the name of the IO control command. int name() const { - return FIONBIO; + return (int)FIONBIO; } // Set the value of the I/O control command. boost/asio/detail/reactive_socket_service.hpp.diff000644 011031 000145 00000001547 11477474634 023735 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/detail/reactive_socket_service.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/reactive_socket_service.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98058.81 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/detail/reactive_socket_service.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -274,8 +274,8 @@ typename op::ptr p = { boost::addressof(handler), boost_asio_handler_alloc_helpers::allocate( sizeof(op), handler), 0 }; - int protocol_type = impl.protocol_.type(); - p.p = new (p.v) op(impl.socket_, protocol_type, + int local_protocol_type = impl.protocol_.type(); + p.p = new (p.v) op(impl.socket_, local_protocol_type, buffers, sender_endpoint, flags, handler); start_op(impl, boost/asio/impl/io_service.hpp.diff000644 011031 000145 00000001314 11477474634 020661 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/impl/io_service.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/impl/io_service.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98064.3 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/impl/io_service.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -91,8 +91,8 @@ return detail::wrapped_handler(*this, handler); } -inline io_service::work::work(boost::asio::io_service& io_service) - : io_service_(io_service) +inline io_service::work::work(boost::asio::io_service& io_service_arg) + : io_service_(io_service_arg) { io_service_.impl_.work_started(); } boost/asio/impl/read_until.hpp.diff000644 011031 000145 00000016221 11477474634 020663 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/impl/read_until.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/impl/read_until.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98067.16 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/impl/read_until.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -351,16 +351,16 @@ Allocator>::const_buffers_type const_buffers_type; typedef boost::asio::buffers_iterator iterator; const_buffers_type buffers = streambuf_.data(); - iterator begin = iterator::begin(buffers); - iterator start = begin + search_position_; - iterator end = iterator::end(buffers); + iterator iter_begin = iterator::begin(buffers); + iterator iter_start = iter_begin + search_position_; + iterator iter_end = iterator::end(buffers); // Look for a match. - iterator iter = std::find(start, end, delim_); - if (iter != end) + iterator iter = std::find(iter_start, iter_end, delim_); + if (iter != iter_end) { // Found a match. We're done. - search_position_ = iter - begin + 1; + search_position_ = iter - iter_begin + 1; bytes_to_read = 0; } @@ -375,7 +375,7 @@ else { // Next search can start with the new data. - search_position_ = end - begin; + search_position_ = iter_end - iter_begin; bytes_to_read = read_size_helper(streambuf_, 65536); } } @@ -477,17 +477,17 @@ Allocator>::const_buffers_type const_buffers_type; typedef boost::asio::buffers_iterator iterator; const_buffers_type buffers = streambuf_.data(); - iterator begin = iterator::begin(buffers); - iterator start = begin + search_position_; - iterator end = iterator::end(buffers); + iterator iter_begin = iterator::begin(buffers); + iterator iter_start = iter_begin + search_position_; + iterator iter_end = iterator::end(buffers); // Look for a match. std::pair result = detail::partial_search( - start, end, delim_.begin(), delim_.end()); - if (result.first != end && result.second) + iter_start, iter_end, delim_.begin(), delim_.end()); + if (result.first != iter_end && result.second) { // Full match. We're done. - search_position_ = result.first - begin + delim_.length(); + search_position_ = result.first - iter_begin + delim_.length(); bytes_to_read = 0; } @@ -501,16 +501,16 @@ // Need to read some more data. else { - if (result.first != end) + if (result.first != iter_end) { // Partial match. Next search needs to start from beginning of // match. - search_position_ = result.first - begin; + search_position_ = result.first - iter_begin; } else { // Next search can start with the new data. - search_position_ = end - begin; + search_position_ = iter_end - iter_begin; } bytes_to_read = read_size_helper(streambuf_, 65536); @@ -616,20 +616,20 @@ Allocator>::const_buffers_type const_buffers_type; typedef boost::asio::buffers_iterator iterator; const_buffers_type buffers = streambuf_.data(); - iterator begin = iterator::begin(buffers); - iterator start = begin + search_position_; - iterator end = iterator::end(buffers); + iterator iter_begin = iterator::begin(buffers); + iterator iter_start = iter_begin + search_position_; + iterator iter_end = iterator::end(buffers); // Look for a match. boost::match_results >::allocator_type> match_results; - bool match = regex_search(start, end, match_results, expr_, + bool match = regex_search(iter_start, iter_end, match_results, expr_, boost::match_default | boost::match_partial); if (match && match_results[0].matched) { // Full match. We're done. - search_position_ = match_results[0].second - begin; + search_position_ = match_results[0].second - iter_begin; bytes_to_read = 0; } @@ -647,12 +647,12 @@ { // Partial match. Next search needs to start from beginning of // match. - search_position_ = match_results[0].first - begin; + search_position_ = match_results[0].first - iter_begin; } else { // Next search can start with the new data. - search_position_ = end - begin; + search_position_ = iter_end - iter_begin; } bytes_to_read = read_size_helper(streambuf_, 65536); @@ -760,16 +760,16 @@ Allocator>::const_buffers_type const_buffers_type; typedef boost::asio::buffers_iterator iterator; const_buffers_type buffers = streambuf_.data(); - iterator begin = iterator::begin(buffers); - iterator start = begin + search_position_; - iterator end = iterator::end(buffers); + iterator iter_begin = iterator::begin(buffers); + iterator iter_start = iter_begin + search_position_; + iterator iter_end = iterator::end(buffers); // Look for a match. - std::pair result = match_condition_(start, end); + std::pair result = match_condition_(iter_start, iter_end); if (result.second) { // Full match. We're done. - search_position_ = result.first - begin; + search_position_ = result.first - iter_begin; bytes_to_read = 0; } @@ -783,16 +783,16 @@ // Need to read some more data. else { - if (result.first != end) + if (result.first != iter_end) { // Partial match. Next search needs to start from beginning of // match. - search_position_ = result.first - begin; + search_position_ = result.first - iter_begin; } else { // Next search can start with the new data. - search_position_ = end - begin; + search_position_ = iter_end - iter_begin; } bytes_to_read = read_size_helper(streambuf_, 65536); boost/asio/ip/detail/impl/endpoint.ipp.diff000644 011031 000145 00000001405 11477474635 022227 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/ip/detail/impl/endpoint.ipp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/detail/impl/endpoint.ipp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98085.6 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/detail/impl/endpoint.ipp 2010-12-06 16:34:23.000000000 -0500 @@ -90,9 +90,9 @@ } } -void endpoint::resize(std::size_t size) +void endpoint::resize(std::size_t size_arg) { - if (size > sizeof(boost::asio::detail::sockaddr_storage_type)) + if (size_arg > sizeof(boost::asio::detail::sockaddr_storage_type)) { boost::system::error_code ec(boost::asio::error::invalid_argument); boost::asio::detail::throw_error(ec); boost/asio/ip/impl/address_v6.ipp.diff000644 011031 000145 00000001224 11477474635 021204 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/ip/impl/address_v6.ipp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/impl/address_v6.ipp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98091.36 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/impl/address_v6.ipp 2010-12-06 13:21:25.000000000 -0500 @@ -39,8 +39,8 @@ } address_v6::address_v6(const address_v6::bytes_type& bytes, - unsigned long scope_id) - : scope_id_(scope_id) + unsigned long scope_id_arg) + : scope_id_(scope_id_arg) { #if UCHAR_MAX > 0xFF for (std::size_t i = 0; i < bytes.size(); ++i) boost/asio/ip/basic_endpoint.hpp.diff000644 011031 000145 00000002025 11477474634 021162 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/ip/basic_endpoint.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/basic_endpoint.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98073.40 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/basic_endpoint.hpp 2010-12-06 16:26:53.000000000 -0500 @@ -78,8 +78,8 @@ * boost::asio::ip::udp::endpoint ep(boost::asio::ip::udp::v6(), 9876); * @endcode */ - basic_endpoint(const InternetProtocol& protocol, unsigned short port_num) - : impl_(protocol.family(), port_num) + basic_endpoint(const InternetProtocol& protocol_arg, unsigned short port_num) + : impl_(protocol_arg.family(), port_num) { } @@ -131,9 +131,9 @@ } /// Set the underlying size of the endpoint in the native type. - void resize(std::size_t size) + void resize(std::size_t size_arg) { - impl_.resize(size); + impl_.resize(size_arg); } /// Get the capacity of the endpoint in the native type. boost/asio/ip/basic_resolver.hpp.diff000644 011031 000145 00000001457 11477474635 021214 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/ip/basic_resolver.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/basic_resolver.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98076.94 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/basic_resolver.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -63,8 +63,8 @@ * @param io_service The io_service object that the resolver will use to * dispatch handlers for any asynchronous operations performed on the timer. */ - explicit basic_resolver(boost::asio::io_service& io_service) - : basic_io_object(io_service) + explicit basic_resolver(boost::asio::io_service& io_service_arg) + : basic_io_object(io_service_arg) { } boost/asio/ip/basic_resolver_entry.hpp.diff000644 011031 000145 00000001710 11477474635 022425 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/ip/basic_resolver_entry.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/basic_resolver_entry.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98079.9 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/basic_resolver_entry.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -49,11 +49,11 @@ } /// Construct with specified endpoint, host name and service name. - basic_resolver_entry(const endpoint_type& endpoint, - const std::string& host_name, const std::string& service_name) - : endpoint_(endpoint), - host_name_(host_name), - service_name_(service_name) + basic_resolver_entry(const endpoint_type& endpoint_arg, + const std::string& host_name_arg, const std::string& service_name_arg) + : endpoint_(endpoint_arg), + host_name_(host_name_arg), + service_name_(service_name_arg) { } boost/asio/ip/basic_resolver_query.hpp.diff000644 011031 000145 00000005446 11477474635 022443 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/ip/basic_resolver_query.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/basic_resolver_query.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98082.43 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/basic_resolver_query.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -60,11 +60,11 @@ * c:\\windows\\system32\\drivers\\etc\\services. Operating systems * may use additional locations when resolving service names. */ - basic_resolver_query(const std::string& service_name, + basic_resolver_query(const std::string& service_name_arg, resolver_query_base::flags resolve_flags = passive | address_configured) : hints_(), host_name_(), - service_name_(service_name) + service_name_(service_name_arg) { typename InternetProtocol::endpoint endpoint; hints_.ai_flags = static_cast(resolve_flags); @@ -98,11 +98,11 @@ * may use additional locations when resolving service names. */ basic_resolver_query(const protocol_type& protocol, - const std::string& service_name, + const std::string& service_name_arg, resolver_query_base::flags resolve_flags = passive | address_configured) : hints_(), host_name_(), - service_name_(service_name) + service_name_(service_name_arg) { hints_.ai_flags = static_cast(resolve_flags); hints_.ai_family = protocol.family(); @@ -145,12 +145,12 @@ * c:\\windows\\system32\\drivers\\etc\\services. Operating systems * may use additional locations when resolving service names. */ - basic_resolver_query(const std::string& host_name, - const std::string& service_name, + basic_resolver_query(const std::string& host_name_arg, + const std::string& service_name_arg, resolver_query_base::flags resolve_flags = address_configured) : hints_(), - host_name_(host_name), - service_name_(service_name) + host_name_(host_name_arg), + service_name_(service_name_arg) { typename InternetProtocol::endpoint endpoint; hints_.ai_flags = static_cast(resolve_flags); @@ -198,11 +198,11 @@ * may use additional locations when resolving service names. */ basic_resolver_query(const protocol_type& protocol, - const std::string& host_name, const std::string& service_name, + const std::string& host_name_arg, const std::string& service_name_arg, resolver_query_base::flags resolve_flags = address_configured) : hints_(), - host_name_(host_name), - service_name_(service_name) + host_name_(host_name_arg), + service_name_(service_name_arg) { hints_.ai_flags = static_cast(resolve_flags); hints_.ai_family = protocol.family(); boost/asio/ip/icmp.hpp.diff000644 011031 000145 00000001200 11477474635 017124 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/ip/icmp.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/icmp.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98088.57 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/icmp.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -102,9 +102,9 @@ private: // Construct with a specific family. - explicit icmp(int protocol, int family) - : protocol_(protocol), - family_(family) + explicit icmp(int protocol_arg, int family_arg) + : protocol_(protocol_arg), + family_(family_arg) { } boost/asio/ip/resolver_service.hpp.diff000644 011031 000145 00000001546 11477474635 021572 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/ip/resolver_service.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/resolver_service.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98094.76 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/resolver_service.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -70,10 +70,10 @@ #endif /// Construct a new resolver service for the specified io_service. - explicit resolver_service(boost::asio::io_service& io_service) + explicit resolver_service(boost::asio::io_service& io_service_arg) : boost::asio::detail::service_base< - resolver_service >(io_service), - service_impl_(io_service) + resolver_service >(io_service_arg), + service_impl_(io_service_arg) { } boost/asio/ip/tcp.hpp.diff000644 011031 000145 00000001037 11477474635 016772 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/ip/tcp.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/tcp.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98097.54 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/tcp.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -146,8 +146,8 @@ private: // Construct with a specific family. - explicit tcp(int family) - : family_(family) + explicit tcp(int family_arg) + : family_(family_arg) { } boost/asio/ip/udp.hpp.diff000644 011031 000145 00000001037 11477474635 016774 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/ip/udp.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/udp.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98100.23 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/ip/udp.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -102,8 +102,8 @@ private: // Construct with a specific family. - explicit udp(int family) - : family_(family) + explicit udp(int family_arg) + : family_(family_arg) { } boost/asio/local/detail/impl/endpoint.ipp.diff000644 011031 000145 00000004045 11477474635 022714 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/local/detail/impl/endpoint.ipp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/local/detail/impl/endpoint.ipp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98106.74 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/local/detail/impl/endpoint.ipp 2010-12-06 16:38:04.000000000 -0500 @@ -38,31 +38,31 @@ init("", 0); } -endpoint::endpoint(const char* path) +endpoint::endpoint(const char* path_arg) { using namespace std; // For strlen. - init(path, strlen(path)); + init(path_arg, strlen(path_arg)); } -endpoint::endpoint(const std::string& path) +endpoint::endpoint(const std::string& path_arg) { - init(path.data(), path.length()); + init(path_arg.data(), path_arg.length()); } -void endpoint::resize(std::size_t size) +void endpoint::resize(std::size_t size_arg) { - if (size > sizeof(boost::asio::detail::sockaddr_un_type)) + if (size_arg > sizeof(boost::asio::detail::sockaddr_un_type)) { boost::system::error_code ec(boost::asio::error::invalid_argument); boost::asio::detail::throw_error(ec); } - else if (size == 0) + else if (size_arg == 0) { path_length_ = 0; } else { - path_length_ = size + path_length_ = size_arg - offsetof(boost::asio::detail::sockaddr_un_type, sun_path); // The path returned by the operating system may be NUL-terminated. @@ -97,7 +97,7 @@ return e1.path() < e2.path(); } -void endpoint::init(const char* path, std::size_t path_length) +void endpoint::init(const char* path_arg, std::size_t path_length) { if (path_length > sizeof(data_.local.sun_path) - 1) { @@ -109,7 +109,7 @@ using namespace std; // For memcpy. data_.local = boost::asio::detail::sockaddr_un_type(); data_.local.sun_family = AF_UNIX; - memcpy(data_.local.sun_path, path, path_length); + memcpy(data_.local.sun_path, path_arg, path_length); path_length_ = path_length; // NUL-terminate normal path names. Names that start with a NUL are in the boost/asio/local/basic_endpoint.hpp.diff000644 011031 000145 00000002116 11477474635 021646 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/local/basic_endpoint.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/local/basic_endpoint.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98103.37 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/local/basic_endpoint.hpp 2010-12-06 16:36:31.000000000 -0500 @@ -66,14 +66,14 @@ } /// Construct an endpoint using the specified path name. - basic_endpoint(const char* path) - : impl_(path) + basic_endpoint(const char* path_arg) + : impl_(path_arg) { } /// Construct an endpoint using the specified path name. - basic_endpoint(const std::string& path) - : impl_(path) + basic_endpoint(const std::string& path_arg) + : impl_(path_arg) { } @@ -115,9 +115,9 @@ } /// Set the underlying size of the endpoint in the native type. - void resize(std::size_t size) + void resize(std::size_t size_arg) { - impl_.resize(size); + impl_.resize(size_arg); } /// Get the capacity of the endpoint in the native type. boost/asio/posix/stream_descriptor_service.hpp.diff000644 011031 000145 00000001645 11477474635 024214 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/posix/stream_descriptor_service.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/posix/stream_descriptor_service.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98109.21 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/posix/stream_descriptor_service.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -65,9 +65,9 @@ #endif /// Construct a new stream descriptor service for the specified io_service. - explicit stream_descriptor_service(boost::asio::io_service& io_service) - : boost::asio::detail::service_base(io_service), - service_impl_(io_service) + explicit stream_descriptor_service(boost::asio::io_service& io_service_arg) + : boost::asio::detail::service_base(io_service_arg), + service_impl_(io_service_arg) { } boost/asio/basic_io_object.hpp.diff000644 011031 000145 00000001441 11477474633 020667 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/basic_io_object.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/basic_io_object.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98019.31 2010-12-07 13:14:51.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/basic_io_object.hpp 2010-12-06 13:21:24.000000000 -0500 @@ -69,8 +69,8 @@ * Performs: * @code service.construct(implementation); @endcode */ - explicit basic_io_object(boost::asio::io_service& io_service) - : service(boost::asio::use_service(io_service)) + explicit basic_io_object(boost::asio::io_service& io_service_arg) + : service(boost::asio::use_service(io_service_arg)) { service.construct(implementation); } boost/asio/basic_socket.hpp.diff000644 011031 000145 00000001427 11477474634 020227 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/basic_socket.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/basic_socket.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98022.82 2010-12-07 13:14:51.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/basic_socket.hpp 2010-12-06 13:21:24.000000000 -0500 @@ -60,8 +60,8 @@ * @param io_service The io_service object that the socket will use to * dispatch handlers for any asynchronous operations performed on the socket. */ - explicit basic_socket(boost::asio::io_service& io_service) - : basic_io_object(io_service) + explicit basic_socket(boost::asio::io_service& io_service_arg) + : basic_io_object(io_service_arg) { } boost/asio/basic_socket_acceptor.hpp.diff000644 011031 000145 00000001601 11477474634 022101 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/basic_socket_acceptor.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/basic_socket_acceptor.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98025.89 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/basic_socket_acceptor.hpp 2010-12-06 13:21:24.000000000 -0500 @@ -127,9 +127,9 @@ * acceptor.listen(listen_backlog); * @endcode */ - basic_socket_acceptor(boost::asio::io_service& io_service, + basic_socket_acceptor(boost::asio::io_service& io_service_arg, const endpoint_type& endpoint, bool reuse_addr = true) - : basic_io_object(io_service) + : basic_io_object(io_service_arg) { boost::system::error_code ec; this->service.open(this->implementation, endpoint.protocol(), ec); boost/asio/basic_stream_socket.hpp.diff000644 011031 000145 00000001532 11477474634 021577 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/basic_stream_socket.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/basic_stream_socket.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98028.1 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/basic_stream_socket.hpp 2010-12-06 13:21:24.000000000 -0500 @@ -63,8 +63,8 @@ * @param io_service The io_service object that the stream socket will use to * dispatch handlers for any asynchronous operations performed on the socket. */ - explicit basic_stream_socket(boost::asio::io_service& io_service) - : basic_socket(io_service) + explicit basic_stream_socket(boost::asio::io_service& io_service_arg) + : basic_socket(io_service_arg) { } boost/asio/basic_streambuf.hpp.diff000644 011031 000145 00000001512 11477474634 020722 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/basic_streambuf.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/basic_streambuf.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98031.90 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/basic_streambuf.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -130,9 +130,9 @@ * of the streambuf's input sequence is 0. */ explicit basic_streambuf( - std::size_t max_size = (std::numeric_limits::max)(), + std::size_t max_size_arg = (std::numeric_limits::max)(), const Allocator& allocator = Allocator()) - : max_size_(max_size), + : max_size_(max_size_arg), buffer_(allocator) { std::size_t pend = (std::min)(max_size_, buffer_delta); boost/asio/io_service.hpp.diff000644 011031 000145 00000001256 11477474634 017725 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/io_service.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/io_service.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98070.35 2010-12-07 13:14:52.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/io_service.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -666,8 +666,8 @@ static boost::asio::detail::service_id id; // Constructor. - service_base(boost::asio::io_service& io_service) - : boost::asio::io_service::service(io_service) + service_base(boost::asio::io_service& io_service_arg) + : boost::asio::io_service::service(io_service_arg) { } }; boost/asio/serial_port_service.hpp.diff000644 011031 000145 00000001543 11477474635 021641 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/serial_port_service.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/serial_port_service.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98112.86 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/serial_port_service.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -71,9 +71,9 @@ #endif /// Construct a new serial port service for the specified io_service. - explicit serial_port_service(boost::asio::io_service& io_service) - : boost::asio::detail::service_base(io_service), - service_impl_(io_service) + explicit serial_port_service(boost::asio::io_service& io_service_arg) + : boost::asio::detail::service_base(io_service_arg), + service_impl_(io_service_arg) { } boost/asio/socket_acceptor_service.hpp.diff000644 011031 000145 00000001605 11477474635 022465 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/socket_acceptor_service.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/socket_acceptor_service.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98115.41 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/socket_acceptor_service.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -76,10 +76,10 @@ #endif /// Construct a new socket acceptor service for the specified io_service. - explicit socket_acceptor_service(boost::asio::io_service& io_service) + explicit socket_acceptor_service(boost::asio::io_service& io_service_arg) : boost::asio::detail::service_base< - socket_acceptor_service >(io_service), - service_impl_(io_service) + socket_acceptor_service >(io_service_arg), + service_impl_(io_service_arg) { } boost/asio/strand.hpp.diff000644 011031 000145 00000001464 11477474635 017073 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/strand.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/strand.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98118.74 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/strand.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -88,9 +88,9 @@ * @param io_service The io_service object that the strand will use to * dispatch handlers that are ready to be run. */ - explicit strand(boost::asio::io_service& io_service) + explicit strand(boost::asio::io_service& io_service_arg) : service_(boost::asio::use_service< - boost::asio::detail::strand_service>(io_service)) + boost::asio::detail::strand_service>(io_service_arg)) { service_.construct(impl_); } boost/asio/stream_socket_service.hpp.diff000644 011031 000145 00000001565 11477474635 022165 0ustar00rmckeeveusers000000 000000 --- //3rdparty/tmw/boost/boost/asio/stream_socket_service.hpp 2010-10-19 18:39:32.000000000 -0400 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/stream_socket_service.hpp 2010-10-19 18:39:32.000000000 -0400 --- /tmp/tmp.98121.46 2010-12-07 13:14:53.000000000 -0500 +++ /sandbox/rmckeeve/3p-tmw/3p/sources/boost/boost/asio/stream_socket_service.hpp 2010-12-06 13:21:25.000000000 -0500 @@ -76,10 +76,10 @@ #endif /// Construct a new stream socket service for the specified io_service. - explicit stream_socket_service(boost::asio::io_service& io_service) + explicit stream_socket_service(boost::asio::io_service& io_service_arg) : boost::asio::detail::service_base< - stream_socket_service >(io_service), - service_impl_(io_service) + stream_socket_service >(io_service_arg), + service_impl_(io_service_arg) { }