Ticket #3216: shadow-patches.txt

File shadow-patches.txt, 62.7 KB (added by Arne Juul <arnej@…>, 13 years ago)

Here's more patches that just renames variables to make -Wshadow silent.

Line 
1diff -ru boost_1_39_0/boost/asio/basic_io_object.hpp boost_1_39_0.patched/boost/asio/basic_io_object.hpp
2--- boost_1_39_0/boost/asio/basic_io_object.hpp 2008-06-20 00:20:52.000000000 +0200
3+++ boost_1_39_0.patched/boost/asio/basic_io_object.hpp 2009-06-23 15:18:03.000000000 +0200
4@@ -68,8 +68,8 @@
5 * Performs:
6 * @code service.construct(implementation); @endcode
7 */
8- explicit basic_io_object(boost::asio::io_service& io_service)
9- : service(boost::asio::use_service<IoObjectService>(io_service))
10+ explicit basic_io_object(boost::asio::io_service& arg_io_service)
11+ : service(boost::asio::use_service<IoObjectService>(arg_io_service))
12 {
13 service.construct(implementation);
14 }
15diff -ru boost_1_39_0/boost/asio/basic_socket.hpp boost_1_39_0.patched/boost/asio/basic_socket.hpp
16--- boost_1_39_0/boost/asio/basic_socket.hpp 2008-10-09 07:41:50.000000000 +0200
17+++ boost_1_39_0.patched/boost/asio/basic_socket.hpp 2009-06-23 15:18:03.000000000 +0200
18@@ -63,8 +63,8 @@
19 * @param io_service The io_service object that the socket will use to
20 * dispatch handlers for any asynchronous operations performed on the socket.
21 */
22- explicit basic_socket(boost::asio::io_service& io_service)
23- : basic_io_object<SocketService>(io_service)
24+ explicit basic_socket(boost::asio::io_service& arg_io_service)
25+ : basic_io_object<SocketService>(arg_io_service)
26 {
27 }
28
29diff -ru boost_1_39_0/boost/asio/basic_stream_socket.hpp boost_1_39_0.patched/boost/asio/basic_stream_socket.hpp
30--- boost_1_39_0/boost/asio/basic_stream_socket.hpp 2008-03-12 15:12:08.000000000 +0100
31+++ boost_1_39_0.patched/boost/asio/basic_stream_socket.hpp 2009-06-23 15:18:03.000000000 +0200
32@@ -66,8 +66,8 @@
33 * @param io_service The io_service object that the stream socket will use to
34 * dispatch handlers for any asynchronous operations performed on the socket.
35 */
36- explicit basic_stream_socket(boost::asio::io_service& io_service)
37- : basic_socket<Protocol, StreamSocketService>(io_service)
38+ explicit basic_stream_socket(boost::asio::io_service& arg_io_service)
39+ : basic_socket<Protocol, StreamSocketService>(arg_io_service)
40 {
41 }
42
43diff -ru boost_1_39_0/boost/asio/basic_streambuf.hpp boost_1_39_0.patched/boost/asio/basic_streambuf.hpp
44--- boost_1_39_0/boost/asio/basic_streambuf.hpp 2008-10-31 13:05:52.000000000 +0100
45+++ boost_1_39_0.patched/boost/asio/basic_streambuf.hpp 2009-06-23 15:18:03.000000000 +0200
46@@ -124,9 +124,9 @@
47 * of the streambuf's input sequence is 0.
48 */
49 explicit basic_streambuf(
50- std::size_t max_size = (std::numeric_limits<std::size_t>::max)(),
51+ std::size_t arg_max_size = (std::numeric_limits<std::size_t>::max)(),
52 const Allocator& allocator = Allocator())
53- : max_size_(max_size),
54+ : max_size_(arg_max_size),
55 buffer_(allocator)
56 {
57 std::size_t pend = (std::min<std::size_t>)(max_size_, buffer_delta);
58diff -ru boost_1_39_0/boost/asio/detail/buffered_stream_storage.hpp boost_1_39_0.patched/boost/asio/detail/buffered_stream_storage.hpp
59--- boost_1_39_0/boost/asio/detail/buffered_stream_storage.hpp 2008-03-12 15:12:08.000000000 +0100
60+++ boost_1_39_0.patched/boost/asio/detail/buffered_stream_storage.hpp 2009-06-23 15:18:03.000000000 +0200
61@@ -39,10 +39,10 @@
62 typedef std::size_t size_type;
63
64 // Constructor.
65- explicit buffered_stream_storage(std::size_t capacity)
66+ explicit buffered_stream_storage(std::size_t arg_capacity)
67 : begin_offset_(0),
68 end_offset_(0),
69- buffer_(capacity)
70+ buffer_(arg_capacity)
71 {
72 }
73
74diff -ru boost_1_39_0/boost/asio/detail/deadline_timer_service.hpp boost_1_39_0.patched/boost/asio/detail/deadline_timer_service.hpp
75--- boost_1_39_0/boost/asio/detail/deadline_timer_service.hpp 2008-10-09 22:43:26.000000000 +0200
76+++ boost_1_39_0.patched/boost/asio/detail/deadline_timer_service.hpp 2009-06-23 15:18:03.000000000 +0200
77@@ -148,8 +148,8 @@
78 ::timeval tv;
79 tv.tv_sec = timeout.total_seconds();
80 tv.tv_usec = timeout.total_microseconds() % 1000000;
81- boost::system::error_code ec;
82- socket_ops::select(0, 0, 0, 0, &tv, ec);
83+ boost::system::error_code tmp_ec;
84+ socket_ops::select(0, 0, 0, 0, &tv, tmp_ec);
85 now = Time_Traits::now();
86 }
87 ec = boost::system::error_code();
88diff -ru boost_1_39_0/boost/asio/detail/hash_map.hpp boost_1_39_0.patched/boost/asio/detail/hash_map.hpp
89--- boost_1_39_0/boost/asio/detail/hash_map.hpp 2009-04-11 01:44:53.000000000 +0200
90+++ boost_1_39_0.patched/boost/asio/detail/hash_map.hpp 2009-06-23 16:22:36.000000000 +0200
91@@ -104,9 +104,9 @@
92 iterator it = buckets_[bucket].first;
93 if (it == values_.end())
94 return values_.end();
95- iterator end = buckets_[bucket].last;
96- ++end;
97- while (it != end)
98+ iterator tmp_end = buckets_[bucket].last;
99+ ++tmp_end;
100+ while (it != tmp_end)
101 {
102 if (it->first == k)
103 return it;
104@@ -122,9 +122,9 @@
105 const_iterator it = buckets_[bucket].first;
106 if (it == values_.end())
107 return it;
108- const_iterator end = buckets_[bucket].last;
109- ++end;
110- while (it != end)
111+ const_iterator tmp_end = buckets_[bucket].last;
112+ ++tmp_end;
113+ while (it != tmp_end)
114 {
115 if (it->first == k)
116 return it;
117@@ -147,15 +147,15 @@
118 ++size_;
119 return std::pair<iterator, bool>(buckets_[bucket].last, true);
120 }
121- iterator end = buckets_[bucket].last;
122- ++end;
123- while (it != end)
124+ iterator tmp_end = buckets_[bucket].last;
125+ ++tmp_end;
126+ while (it != tmp_end)
127 {
128 if (it->first == v.first)
129 return std::pair<iterator, bool>(it, false);
130 ++it;
131 }
132- buckets_[bucket].last = values_insert(end, v);
133+ buckets_[bucket].last = values_insert(tmp_end, v);
134 ++size_;
135 return std::pair<iterator, bool>(buckets_[bucket].last, true);
136 }
137@@ -215,19 +215,19 @@
138 // Re-initialise the hash from the values already contained in the list.
139 void rehash(std::size_t num_buckets)
140 {
141- iterator end = values_.end();
142+ iterator tmp_end = values_.end();
143
144 // Update number of buckets and initialise all buckets to empty.
145 buckets_.resize(num_buckets);
146 for (std::size_t i = 0; i < buckets_.size(); ++i)
147- buckets_[i].first = buckets_[i].last = end;
148+ buckets_[i].first = buckets_[i].last = tmp_end;
149
150 // Put all values back into the hash.
151 iterator iter = values_.begin();
152- while (iter != end)
153+ while (iter != tmp_end)
154 {
155 std::size_t bucket = calculate_hash_value(iter->first) % buckets_.size();
156- if (buckets_[bucket].last == end)
157+ if (buckets_[bucket].last == tmp_end)
158 {
159 buckets_[bucket].first = buckets_[bucket].last = iter++;
160 }
161diff -ru boost_1_39_0/boost/asio/detail/reactive_descriptor_service.hpp boost_1_39_0.patched/boost/asio/detail/reactive_descriptor_service.hpp
162--- boost_1_39_0/boost/asio/detail/reactive_descriptor_service.hpp 2008-10-09 22:43:26.000000000 +0200
163+++ boost_1_39_0.patched/boost/asio/detail/reactive_descriptor_service.hpp 2009-06-23 15:18:03.000000000 +0200
164@@ -77,10 +77,10 @@
165 enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len };
166
167 // Constructor.
168- reactive_descriptor_service(boost::asio::io_service& io_service)
169+ reactive_descriptor_service(boost::asio::io_service& arg_io_service)
170 : boost::asio::detail::service_base<
171- reactive_descriptor_service<Reactor> >(io_service),
172- reactor_(boost::asio::use_service<Reactor>(io_service))
173+ reactive_descriptor_service<Reactor> >(arg_io_service),
174+ reactor_(boost::asio::use_service<Reactor>(arg_io_service))
175 {
176 reactor_.init_task();
177 }
178diff -ru boost_1_39_0/boost/asio/detail/reactive_serial_port_service.hpp boost_1_39_0.patched/boost/asio/detail/reactive_serial_port_service.hpp
179--- boost_1_39_0/boost/asio/detail/reactive_serial_port_service.hpp 2009-04-20 01:00:29.000000000 +0200
180+++ boost_1_39_0.patched/boost/asio/detail/reactive_serial_port_service.hpp 2009-06-23 15:18:03.000000000 +0200
181@@ -52,11 +52,11 @@
182 typedef typename reactive_descriptor_service<Reactor>::implementation_type
183 implementation_type;
184
185- reactive_serial_port_service(boost::asio::io_service& io_service)
186+ reactive_serial_port_service(boost::asio::io_service& arg_io_service)
187 : boost::asio::detail::service_base<
188- reactive_serial_port_service>(io_service),
189+ reactive_serial_port_service>(arg_io_service),
190 descriptor_service_(boost::asio::use_service<
191- reactive_descriptor_service<Reactor> >(io_service))
192+ reactive_descriptor_service<Reactor> >(arg_io_service))
193 {
194 }
195
196diff -ru boost_1_39_0/boost/asio/detail/reactive_socket_service.hpp boost_1_39_0.patched/boost/asio/detail/reactive_socket_service.hpp
197--- boost_1_39_0/boost/asio/detail/reactive_socket_service.hpp 2009-04-11 01:44:53.000000000 +0200
198+++ boost_1_39_0.patched/boost/asio/detail/reactive_socket_service.hpp 2009-06-23 15:18:03.000000000 +0200
199@@ -105,10 +105,10 @@
200 enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len };
201
202 // Constructor.
203- reactive_socket_service(boost::asio::io_service& io_service)
204+ reactive_socket_service(boost::asio::io_service& arg_io_service)
205 : boost::asio::detail::service_base<
206- reactive_socket_service<Protocol, Reactor> >(io_service),
207- reactor_(boost::asio::use_service<Reactor>(io_service))
208+ reactive_socket_service<Protocol, Reactor> >(arg_io_service),
209+ reactor_(boost::asio::use_service<Reactor>(arg_io_service))
210 {
211 reactor_.init_task();
212 }
213diff -ru boost_1_39_0/boost/asio/detail/reactor_op_queue.hpp boost_1_39_0.patched/boost/asio/detail/reactor_op_queue.hpp
214--- boost_1_39_0/boost/asio/detail/reactor_op_queue.hpp 2008-06-20 00:20:52.000000000 +0200
215+++ boost_1_39_0.patched/boost/asio/detail/reactor_op_queue.hpp 2009-06-23 15:18:03.000000000 +0200
216@@ -325,11 +325,11 @@
217
218 // Construct an operation for the given descriptor.
219 op_base(perform_func_type perform_func, complete_func_type complete_func,
220- destroy_func_type destroy_func, Descriptor descriptor)
221+ destroy_func_type destroy_func, Descriptor arg_descriptor)
222 : perform_func_(perform_func),
223 complete_func_(complete_func),
224 destroy_func_(destroy_func),
225- descriptor_(descriptor),
226+ descriptor_(arg_descriptor),
227 result_(),
228 bytes_transferred_(0),
229 next_(0)
230diff -ru boost_1_39_0/boost/asio/detail/resolver_service.hpp boost_1_39_0.patched/boost/asio/detail/resolver_service.hpp
231--- boost_1_39_0/boost/asio/detail/resolver_service.hpp 2008-10-31 00:24:23.000000000 +0100
232+++ boost_1_39_0.patched/boost/asio/detail/resolver_service.hpp 2009-06-23 15:18:03.000000000 +0200
233@@ -85,9 +85,9 @@
234 typedef typename Protocol::resolver_iterator iterator_type;
235
236 // Constructor.
237- resolver_service(boost::asio::io_service& io_service)
238+ resolver_service(boost::asio::io_service& arg_io_service)
239 : boost::asio::detail::service_base<
240- resolver_service<Protocol> >(io_service),
241+ resolver_service<Protocol> >(arg_io_service),
242 mutex_(),
243 work_io_service_(new boost::asio::io_service),
244 work_(new boost::asio::io_service::work(*work_io_service_)),
245diff -ru boost_1_39_0/boost/asio/detail/select_reactor.hpp boost_1_39_0.patched/boost/asio/detail/select_reactor.hpp
246--- boost_1_39_0/boost/asio/detail/select_reactor.hpp 2008-10-09 22:43:26.000000000 +0200
247+++ boost_1_39_0.patched/boost/asio/detail/select_reactor.hpp 2009-06-23 15:18:03.000000000 +0200
248@@ -58,9 +58,9 @@
249 };
250
251 // Constructor.
252- select_reactor(boost::asio::io_service& io_service)
253+ select_reactor(boost::asio::io_service& arg_io_service)
254 : boost::asio::detail::service_base<
255- select_reactor<Own_Thread> >(io_service),
256+ select_reactor<Own_Thread> >(arg_io_service),
257 mutex_(),
258 select_in_progress_(false),
259 interrupter_(),
260@@ -228,11 +228,11 @@
261 boost::shared_ptr<bool> completed(new bool(false));
262 connect_handler_wrapper<Handler> wrapped_handler(
263 descriptor, completed, *this, handler);
264- bool interrupt = write_op_queue_.enqueue_operation(
265+ bool has_interrupt = write_op_queue_.enqueue_operation(
266 descriptor, wrapped_handler);
267- interrupt = except_op_queue_.enqueue_operation(
268- descriptor, wrapped_handler) || interrupt;
269- if (interrupt)
270+ has_interrupt = except_op_queue_.enqueue_operation(
271+ descriptor, wrapped_handler) || has_interrupt;
272+ if (has_interrupt)
273 interrupter_.interrupt();
274 }
275 }
276@@ -476,10 +476,10 @@
277 // acquire the select_reactor's mutex.
278 void cancel_ops_unlocked(socket_type descriptor)
279 {
280- bool interrupt = read_op_queue_.cancel_operations(descriptor);
281- interrupt = write_op_queue_.cancel_operations(descriptor) || interrupt;
282- interrupt = except_op_queue_.cancel_operations(descriptor) || interrupt;
283- if (interrupt)
284+ bool has_interrupt = read_op_queue_.cancel_operations(descriptor);
285+ has_interrupt = write_op_queue_.cancel_operations(descriptor) || has_interrupt;
286+ has_interrupt = except_op_queue_.cancel_operations(descriptor) || has_interrupt;
287+ if (has_interrupt)
288 interrupter_.interrupt();
289 }
290
291diff -ru boost_1_39_0/boost/asio/detail/service_base.hpp boost_1_39_0.patched/boost/asio/detail/service_base.hpp
292--- boost_1_39_0/boost/asio/detail/service_base.hpp 2008-03-12 15:12:08.000000000 +0100
293+++ boost_1_39_0.patched/boost/asio/detail/service_base.hpp 2009-06-23 15:18:03.000000000 +0200
294@@ -33,8 +33,8 @@
295 static boost::asio::detail::service_id<Type> id;
296
297 // Constructor.
298- service_base(boost::asio::io_service& io_service)
299- : boost::asio::io_service::service(io_service)
300+ service_base(boost::asio::io_service& arg_io_service)
301+ : boost::asio::io_service::service(arg_io_service)
302 {
303 }
304 };
305diff -ru boost_1_39_0/boost/asio/detail/strand_service.hpp boost_1_39_0.patched/boost/asio/detail/strand_service.hpp
306--- boost_1_39_0/boost/asio/detail/strand_service.hpp 2008-06-20 00:20:52.000000000 +0200
307+++ boost_1_39_0.patched/boost/asio/detail/strand_service.hpp 2009-06-23 15:18:03.000000000 +0200
308@@ -358,8 +358,8 @@
309 };
310
311 // Construct a new strand service for the specified io_service.
312- explicit strand_service(boost::asio::io_service& io_service)
313- : boost::asio::detail::service_base<strand_service>(io_service),
314+ explicit strand_service(boost::asio::io_service& arg_io_service)
315+ : boost::asio::detail::service_base<strand_service>(arg_io_service),
316 mutex_(),
317 impl_list_(0)
318 {
319diff -ru boost_1_39_0/boost/asio/detail/task_io_service.hpp boost_1_39_0.patched/boost/asio/detail/task_io_service.hpp
320--- boost_1_39_0/boost/asio/detail/task_io_service.hpp 2008-10-09 22:43:26.000000000 +0200
321+++ boost_1_39_0.patched/boost/asio/detail/task_io_service.hpp 2009-06-23 15:18:03.000000000 +0200
322@@ -41,8 +41,8 @@
323 {
324 public:
325 // Constructor.
326- task_io_service(boost::asio::io_service& io_service)
327- : boost::asio::detail::service_base<task_io_service<Task> >(io_service),
328+ task_io_service(boost::asio::io_service& arg_io_service)
329+ : boost::asio::detail::service_base<task_io_service<Task> >(arg_io_service),
330 mutex_(),
331 task_(0),
332 task_interrupted_(true),
333diff -ru boost_1_39_0/boost/asio/impl/io_service.ipp boost_1_39_0.patched/boost/asio/impl/io_service.ipp
334--- boost_1_39_0/boost/asio/impl/io_service.ipp 2008-03-12 15:12:08.000000000 +0100
335+++ boost_1_39_0.patched/boost/asio/impl/io_service.ipp 2009-06-23 15:18:03.000000000 +0200
336@@ -137,8 +137,8 @@
337 return detail::wrapped_handler<io_service&, Handler>(*this, handler);
338 }
339
340-inline io_service::work::work(boost::asio::io_service& io_service)
341- : io_service_(io_service)
342+inline io_service::work::work(boost::asio::io_service& arg_io_service)
343+ : io_service_(arg_io_service)
344 {
345 io_service_.impl_.work_started();
346 }
347diff -ru boost_1_39_0/boost/asio/impl/read_until.ipp boost_1_39_0.patched/boost/asio/impl/read_until.ipp
348--- boost_1_39_0/boost/asio/impl/read_until.ipp 2008-10-31 00:24:23.000000000 +0100
349+++ boost_1_39_0.patched/boost/asio/impl/read_until.ipp 2009-06-23 15:18:03.000000000 +0200
350@@ -376,8 +376,8 @@
351 if (streambuf_.size() == streambuf_.max_size())
352 {
353 std::size_t bytes = 0;
354- boost::system::error_code ec(error::not_found);
355- handler_(ec, bytes);
356+ boost::system::error_code tmp_ec(error::not_found);
357+ handler_(tmp_ec, bytes);
358 return;
359 }
360
361@@ -708,8 +708,8 @@
362 if (streambuf_.size() == streambuf_.max_size())
363 {
364 std::size_t bytes = 0;
365- boost::system::error_code ec(error::not_found);
366- handler_(ec, bytes);
367+ boost::system::error_code tmp_ec(error::not_found);
368+ handler_(tmp_ec, bytes);
369 return;
370 }
371
372@@ -877,8 +877,8 @@
373 if (streambuf_.size() == streambuf_.max_size())
374 {
375 std::size_t bytes = 0;
376- boost::system::error_code ec(error::not_found);
377- handler_(ec, bytes);
378+ boost::system::error_code tmp_ec(error::not_found);
379+ handler_(tmp_ec, bytes);
380 return;
381 }
382
383diff -ru boost_1_39_0/boost/asio/ip/address_v6.hpp boost_1_39_0.patched/boost/asio/ip/address_v6.hpp
384--- boost_1_39_0/boost/asio/ip/address_v6.hpp 2008-10-09 22:43:26.000000000 +0200
385+++ boost_1_39_0.patched/boost/asio/ip/address_v6.hpp 2009-06-23 15:18:03.000000000 +0200
386@@ -60,8 +60,8 @@
387 }
388
389 /// Construct an address from raw bytes and scope ID.
390- explicit address_v6(const bytes_type& bytes, unsigned long scope_id = 0)
391- : scope_id_(scope_id)
392+ explicit address_v6(const bytes_type& bytes, unsigned long arg_scope_id = 0)
393+ : scope_id_(arg_scope_id)
394 {
395 #if UCHAR_MAX > 0xFF
396 for (std::size_t i = 0; i < bytes.size(); ++i)
397diff -ru boost_1_39_0/boost/asio/ip/basic_endpoint.hpp boost_1_39_0.patched/boost/asio/ip/basic_endpoint.hpp
398--- boost_1_39_0/boost/asio/ip/basic_endpoint.hpp 2009-04-11 01:44:53.000000000 +0200
399+++ boost_1_39_0.patched/boost/asio/ip/basic_endpoint.hpp 2009-06-23 15:18:03.000000000 +0200
400@@ -88,11 +88,11 @@
401 * boost::asio::ip::udp::endpoint ep(boost::asio::ip::udp::v6(), 9876);
402 * @endcode
403 */
404- basic_endpoint(const InternetProtocol& protocol, unsigned short port_num)
405+ basic_endpoint(const InternetProtocol& arg_protocol, unsigned short port_num)
406 : data_()
407 {
408 using namespace std; // For memcpy.
409- if (protocol.family() == PF_INET)
410+ if (arg_protocol.family() == PF_INET)
411 {
412 data_.v4.sin_family = AF_INET;
413 data_.v4.sin_port =
414@@ -183,9 +183,9 @@
415 }
416
417 /// Set the underlying size of the endpoint in the native type.
418- void resize(std::size_t size)
419+ void resize(std::size_t arg_size)
420 {
421- if (size > sizeof(boost::asio::detail::sockaddr_storage_type))
422+ if (arg_size > sizeof(boost::asio::detail::sockaddr_storage_type))
423 {
424 boost::system::system_error e(boost::asio::error::invalid_argument);
425 boost::throw_exception(e);
426diff -ru boost_1_39_0/boost/asio/ip/basic_resolver.hpp boost_1_39_0.patched/boost/asio/ip/basic_resolver.hpp
427--- boost_1_39_0/boost/asio/ip/basic_resolver.hpp 2008-10-09 07:41:50.000000000 +0200
428+++ boost_1_39_0.patched/boost/asio/ip/basic_resolver.hpp 2009-06-23 15:18:03.000000000 +0200
429@@ -60,8 +60,8 @@
430 * @param io_service The io_service object that the resolver will use to
431 * dispatch handlers for any asynchronous operations performed on the timer.
432 */
433- explicit basic_resolver(boost::asio::io_service& io_service)
434- : basic_io_object<ResolverService>(io_service)
435+ explicit basic_resolver(boost::asio::io_service& arg_io_service)
436+ : basic_io_object<ResolverService>(arg_io_service)
437 {
438 }
439
440diff -ru boost_1_39_0/boost/asio/ip/basic_resolver_entry.hpp boost_1_39_0.patched/boost/asio/ip/basic_resolver_entry.hpp
441--- boost_1_39_0/boost/asio/ip/basic_resolver_entry.hpp 2008-03-12 15:12:08.000000000 +0100
442+++ boost_1_39_0.patched/boost/asio/ip/basic_resolver_entry.hpp 2009-06-23 15:18:03.000000000 +0200
443@@ -50,11 +50,11 @@
444 }
445
446 /// Construct with specified endpoint, host name and service name.
447- basic_resolver_entry(const endpoint_type& endpoint,
448- const std::string& host_name, const std::string& service_name)
449- : endpoint_(endpoint),
450- host_name_(host_name),
451- service_name_(service_name)
452+ basic_resolver_entry(const endpoint_type& arg_endpoint,
453+ const std::string& arg_host_name, const std::string& arg_service_name)
454+ : endpoint_(arg_endpoint),
455+ host_name_(arg_host_name),
456+ service_name_(arg_service_name)
457 {
458 }
459
460diff -ru boost_1_39_0/boost/asio/ip/basic_resolver_query.hpp boost_1_39_0.patched/boost/asio/ip/basic_resolver_query.hpp
461--- boost_1_39_0/boost/asio/ip/basic_resolver_query.hpp 2008-03-12 15:12:08.000000000 +0100
462+++ boost_1_39_0.patched/boost/asio/ip/basic_resolver_query.hpp 2009-06-23 15:18:03.000000000 +0200
463@@ -47,11 +47,11 @@
464 typedef InternetProtocol protocol_type;
465
466 /// Construct with specified service name for any protocol.
467- basic_resolver_query(const std::string& service_name,
468+ basic_resolver_query(const std::string& arg_service_name,
469 int flags = passive | address_configured)
470 : hints_(),
471 host_name_(),
472- service_name_(service_name)
473+ service_name_(arg_service_name)
474 {
475 typename InternetProtocol::endpoint endpoint;
476 hints_.ai_flags = flags;
477@@ -66,11 +66,11 @@
478
479 /// Construct with specified service name for a given protocol.
480 basic_resolver_query(const protocol_type& protocol,
481- const std::string& service_name,
482+ const std::string& arg_service_name,
483 int flags = passive | address_configured)
484 : hints_(),
485 host_name_(),
486- service_name_(service_name)
487+ service_name_(arg_service_name)
488 {
489 hints_.ai_flags = flags;
490 hints_.ai_family = protocol.family();
491@@ -83,11 +83,11 @@
492 }
493
494 /// Construct with specified host name and service name for any protocol.
495- basic_resolver_query(const std::string& host_name,
496- const std::string& service_name, int flags = address_configured)
497+ basic_resolver_query(const std::string& arg_host_name,
498+ const std::string& arg_service_name, int flags = address_configured)
499 : hints_(),
500- host_name_(host_name),
501- service_name_(service_name)
502+ host_name_(arg_host_name),
503+ service_name_(arg_service_name)
504 {
505 typename InternetProtocol::endpoint endpoint;
506 hints_.ai_flags = flags;
507@@ -102,11 +102,11 @@
508
509 /// Construct with specified host name and service name for a given protocol.
510 basic_resolver_query(const protocol_type& protocol,
511- const std::string& host_name, const std::string& service_name,
512+ const std::string& arg_host_name, const std::string& arg_service_name,
513 int flags = address_configured)
514 : hints_(),
515- host_name_(host_name),
516- service_name_(service_name)
517+ host_name_(arg_host_name),
518+ service_name_(arg_service_name)
519 {
520 hints_.ai_flags = flags;
521 hints_.ai_family = protocol.family();
522diff -ru boost_1_39_0/boost/asio/ip/icmp.hpp boost_1_39_0.patched/boost/asio/ip/icmp.hpp
523--- boost_1_39_0/boost/asio/ip/icmp.hpp 2008-06-20 00:20:52.000000000 +0200
524+++ boost_1_39_0.patched/boost/asio/ip/icmp.hpp 2009-06-23 15:18:03.000000000 +0200
525@@ -101,9 +101,9 @@
526
527 private:
528 // Construct with a specific family.
529- explicit icmp(int protocol, int family)
530- : protocol_(protocol),
531- family_(family)
532+ explicit icmp(int arg_protocol, int arg_family)
533+ : protocol_(arg_protocol),
534+ family_(arg_family)
535 {
536 }
537
538diff -ru boost_1_39_0/boost/asio/ip/resolver_service.hpp boost_1_39_0.patched/boost/asio/ip/resolver_service.hpp
539--- boost_1_39_0/boost/asio/ip/resolver_service.hpp 2008-03-12 15:12:08.000000000 +0100
540+++ boost_1_39_0.patched/boost/asio/ip/resolver_service.hpp 2009-06-23 15:18:03.000000000 +0200
541@@ -68,10 +68,10 @@
542 #endif
543
544 /// Construct a new resolver service for the specified io_service.
545- explicit resolver_service(boost::asio::io_service& io_service)
546+ explicit resolver_service(boost::asio::io_service& arg_io_service)
547 : boost::asio::detail::service_base<
548- resolver_service<InternetProtocol> >(io_service),
549- service_impl_(boost::asio::use_service<service_impl_type>(io_service))
550+ resolver_service<InternetProtocol> >(arg_io_service),
551+ service_impl_(boost::asio::use_service<service_impl_type>(arg_io_service))
552 {
553 }
554
555diff -ru boost_1_39_0/boost/asio/ip/tcp.hpp boost_1_39_0.patched/boost/asio/ip/tcp.hpp
556--- boost_1_39_0/boost/asio/ip/tcp.hpp 2008-03-12 15:12:08.000000000 +0100
557+++ boost_1_39_0.patched/boost/asio/ip/tcp.hpp 2009-06-23 15:18:03.000000000 +0200
558@@ -143,8 +143,8 @@
559
560 private:
561 // Construct with a specific family.
562- explicit tcp(int family)
563- : family_(family)
564+ explicit tcp(int arg_family)
565+ : family_(arg_family)
566 {
567 }
568
569diff -ru boost_1_39_0/boost/asio/ip/udp.hpp boost_1_39_0.patched/boost/asio/ip/udp.hpp
570--- boost_1_39_0/boost/asio/ip/udp.hpp 2008-03-12 15:12:08.000000000 +0100
571+++ boost_1_39_0.patched/boost/asio/ip/udp.hpp 2009-06-23 15:18:03.000000000 +0200
572@@ -101,8 +101,8 @@
573
574 private:
575 // Construct with a specific family.
576- explicit udp(int family)
577- : family_(family)
578+ explicit udp(int arg_family)
579+ : family_(arg_family)
580 {
581 }
582
583diff -ru boost_1_39_0/boost/asio/local/basic_endpoint.hpp boost_1_39_0.patched/boost/asio/local/basic_endpoint.hpp
584--- boost_1_39_0/boost/asio/local/basic_endpoint.hpp 2008-07-22 10:30:38.000000000 +0200
585+++ boost_1_39_0.patched/boost/asio/local/basic_endpoint.hpp 2009-06-23 15:18:03.000000000 +0200
586@@ -79,16 +79,16 @@
587 }
588
589 /// Construct an endpoint using the specified path name.
590- basic_endpoint(const char* path)
591+ basic_endpoint(const char* arg_path)
592 {
593 using namespace std; // For strlen.
594- init(path, strlen(path));
595+ init(arg_path, strlen(arg_path));
596 }
597
598 /// Construct an endpoint using the specified path name.
599- basic_endpoint(const std::string& path)
600+ basic_endpoint(const std::string& arg_path)
601 {
602- init(path.data(), path.length());
603+ init(arg_path.data(), arg_path.length());
604 }
605
606 /// Copy constructor.
607@@ -132,20 +132,20 @@
608 }
609
610 /// Set the underlying size of the endpoint in the native type.
611- void resize(std::size_t size)
612+ void resize(std::size_t arg_size)
613 {
614- if (size > sizeof(boost::asio::detail::sockaddr_un_type))
615+ if (arg_size > sizeof(boost::asio::detail::sockaddr_un_type))
616 {
617 boost::system::system_error e(boost::asio::error::invalid_argument);
618 boost::throw_exception(e);
619 }
620- else if (size == 0)
621+ else if (arg_size == 0)
622 {
623 path_length_ = 0;
624 }
625 else
626 {
627- path_length_ = size
628+ path_length_ = arg_size
629 - offsetof(boost::asio::detail::sockaddr_un_type, sun_path);
630
631 // The path returned by the operating system may be NUL-terminated.
632@@ -212,7 +212,7 @@
633 std::size_t path_length_;
634
635 // Initialise with a specified path.
636- void init(const char* path, std::size_t path_length)
637+ void init(const char* arg_path, std::size_t path_length)
638 {
639 if (path_length > sizeof(data_.local.sun_path) - 1)
640 {
641@@ -224,7 +224,7 @@
642 using namespace std; // For memcpy.
643 data_.local = boost::asio::detail::sockaddr_un_type();
644 data_.local.sun_family = AF_UNIX;
645- memcpy(data_.local.sun_path, path, path_length);
646+ memcpy(data_.local.sun_path, arg_path, path_length);
647 path_length_ = path_length;
648
649 // NUL-terminate normal path names. Names that start with a NUL are in the
650diff -ru boost_1_39_0/boost/asio/posix/stream_descriptor_service.hpp boost_1_39_0.patched/boost/asio/posix/stream_descriptor_service.hpp
651--- boost_1_39_0/boost/asio/posix/stream_descriptor_service.hpp 2008-06-20 00:20:52.000000000 +0200
652+++ boost_1_39_0.patched/boost/asio/posix/stream_descriptor_service.hpp 2009-06-23 15:18:03.000000000 +0200
653@@ -89,9 +89,9 @@
654 #endif
655
656 /// Construct a new stream descriptor service for the specified io_service.
657- explicit stream_descriptor_service(boost::asio::io_service& io_service)
658- : boost::asio::detail::service_base<stream_descriptor_service>(io_service),
659- service_impl_(boost::asio::use_service<service_impl_type>(io_service))
660+ explicit stream_descriptor_service(boost::asio::io_service& arg_io_service)
661+ : boost::asio::detail::service_base<stream_descriptor_service>(arg_io_service),
662+ service_impl_(boost::asio::use_service<service_impl_type>(arg_io_service))
663 {
664 }
665
666diff -ru boost_1_39_0/boost/asio/serial_port_service.hpp boost_1_39_0.patched/boost/asio/serial_port_service.hpp
667--- boost_1_39_0/boost/asio/serial_port_service.hpp 2009-04-20 01:00:29.000000000 +0200
668+++ boost_1_39_0.patched/boost/asio/serial_port_service.hpp 2009-06-23 15:18:03.000000000 +0200
669@@ -84,9 +84,9 @@
670 #endif
671
672 /// Construct a new serial port service for the specified io_service.
673- explicit serial_port_service(boost::asio::io_service& io_service)
674- : boost::asio::detail::service_base<serial_port_service>(io_service),
675- service_impl_(boost::asio::use_service<service_impl_type>(io_service))
676+ explicit serial_port_service(boost::asio::io_service& arg_io_service)
677+ : boost::asio::detail::service_base<serial_port_service>(arg_io_service),
678+ service_impl_(boost::asio::use_service<service_impl_type>(arg_io_service))
679 {
680 }
681
682diff -ru boost_1_39_0/boost/asio/strand.hpp boost_1_39_0.patched/boost/asio/strand.hpp
683--- boost_1_39_0/boost/asio/strand.hpp 2008-03-12 15:12:08.000000000 +0100
684+++ boost_1_39_0.patched/boost/asio/strand.hpp 2009-06-23 15:18:03.000000000 +0200
685@@ -47,9 +47,9 @@
686 * @param io_service The io_service object that the strand will use to
687 * dispatch handlers that are ready to be run.
688 */
689- explicit strand(boost::asio::io_service& io_service)
690+ explicit strand(boost::asio::io_service& arg_io_service)
691 : service_(boost::asio::use_service<
692- boost::asio::detail::strand_service>(io_service))
693+ boost::asio::detail::strand_service>(arg_io_service))
694 {
695 service_.construct(impl_);
696 }
697diff -ru boost_1_39_0/boost/asio/stream_socket_service.hpp boost_1_39_0.patched/boost/asio/stream_socket_service.hpp
698--- boost_1_39_0/boost/asio/stream_socket_service.hpp 2008-03-12 15:12:08.000000000 +0100
699+++ boost_1_39_0.patched/boost/asio/stream_socket_service.hpp 2009-06-23 15:18:03.000000000 +0200
700@@ -89,10 +89,10 @@
701 #endif
702
703 /// Construct a new stream socket service for the specified io_service.
704- explicit stream_socket_service(boost::asio::io_service& io_service)
705+ explicit stream_socket_service(boost::asio::io_service& arg_io_service)
706 : boost::asio::detail::service_base<
707- stream_socket_service<Protocol> >(io_service),
708- service_impl_(boost::asio::use_service<service_impl_type>(io_service))
709+ stream_socket_service<Protocol> >(arg_io_service),
710+ service_impl_(boost::asio::use_service<service_impl_type>(arg_io_service))
711 {
712 }
713
714diff -ru boost_1_39_0/boost/crc.hpp boost_1_39_0.patched/boost/crc.hpp
715--- boost_1_39_0/boost/crc.hpp 2005-12-08 04:23:02.000000000 +0100
716+++ boost_1_39_0.patched/boost/crc.hpp 2009-06-23 15:18:03.000000000 +0200
717@@ -751,15 +751,15 @@
718 crc_basic<Bits>::process_bits
719 (
720 unsigned char bits,
721- std::size_t bit_count
722+ std::size_t arg_bit_count
723 )
724 {
725 // ignore the bits above the ones we want
726- bits <<= CHAR_BIT - bit_count;
727+ bits <<= CHAR_BIT - arg_bit_count;
728
729 // compute the CRC for each bit, starting with the upper ones
730 unsigned char const high_bit_mask = 1u << ( CHAR_BIT - 1u );
731- for ( std::size_t i = bit_count ; i > 0u ; --i, bits <<= 1u )
732+ for ( std::size_t i = arg_bit_count ; i > 0u ; --i, bits <<= 1u )
733 {
734 process_bit( static_cast<bool>(bits & high_bit_mask) );
735 }
736diff -ru boost_1_39_0/boost/date_time/posix_time/posix_time_config.hpp boost_1_39_0.patched/boost/date_time/posix_time/posix_time_config.hpp
737--- boost_1_39_0/boost/date_time/posix_time/posix_time_config.hpp 2008-10-13 11:00:03.000000000 +0200
738+++ boost_1_39_0.patched/boost/date_time/posix_time/posix_time_config.hpp 2009-06-23 15:18:03.000000000 +0200
739@@ -82,8 +82,8 @@
740 //Give duration access to ticks constructor -- hide from users
741 friend class date_time::time_duration<time_duration, time_res_traits>;
742 private:
743- explicit time_duration(impl_type ticks) :
744- date_time::time_duration<time_duration, time_res_traits>(ticks)
745+ explicit time_duration(impl_type arg_ticks) :
746+ date_time::time_duration<time_duration, time_res_traits>(arg_ticks)
747 {}
748 };
749
750diff -ru boost_1_39_0/boost/exception/diagnostic_information.hpp boost_1_39_0.patched/boost/exception/diagnostic_information.hpp
751--- boost_1_39_0/boost/exception/diagnostic_information.hpp 2009-04-13 07:41:31.000000000 +0200
752+++ boost_1_39_0.patched/boost/exception/diagnostic_information.hpp 2009-06-23 15:18:03.000000000 +0200
753@@ -139,10 +139,10 @@
754 std::string
755 current_exception_diagnostic_information()
756 {
757- if( boost::exception const * e=current_exception_cast<boost::exception const>() )
758- return diagnostic_information(*e);
759- else if( std::exception const * e=current_exception_cast<std::exception const>() )
760- return diagnostic_information(*e);
761+ if( boost::exception const * be=current_exception_cast<boost::exception const>() )
762+ return diagnostic_information(*be);
763+ else if( std::exception const * se=current_exception_cast<std::exception const>() )
764+ return diagnostic_information(*se);
765 else
766 return "No diagnostic information available.";
767 }
768diff -ru boost_1_39_0/boost/exception/info.hpp boost_1_39_0.patched/boost/exception/info.hpp
769--- boost_1_39_0/boost/exception/info.hpp 2009-04-07 20:33:44.000000000 +0200
770+++ boost_1_39_0.patched/boost/exception/info.hpp 2009-06-23 15:18:03.000000000 +0200
771@@ -26,8 +26,8 @@
772 template <class Tag,class T>
773 inline
774 error_info<Tag,T>::
775- error_info( value_type const & value ):
776- value_(value)
777+ error_info( value_type const & arg_value ):
778+ value_(arg_value)
779 {
780 }
781
782diff -ru boost_1_39_0/boost/multi_index/detail/index_matcher.hpp boost_1_39_0.patched/boost/multi_index/detail/index_matcher.hpp
783--- boost_1_39_0/boost/multi_index/detail/index_matcher.hpp 2008-07-03 18:51:53.000000000 +0200
784+++ boost_1_39_0.patched/boost/multi_index/detail/index_matcher.hpp 2009-06-23 15:18:03.000000000 +0200
785@@ -132,17 +132,17 @@
786 entries(),entries()+size_,
787 entry(node),entry::less_by_node()); /* localize entry */
788 ent->ordered=false;
789- std::size_t n=ent->pos; /* get its position */
790+ std::size_t tmp_n=ent->pos; /* get its position */
791
792 entry dummy(0);
793- dummy.pile_top=n;
794+ dummy.pile_top=tmp_n;
795
796 entry* pile_ent= /* find the first available pile */
797 std::lower_bound( /* to stack the entry */
798 entries(),entries()+num_piles,
799 dummy,entry::less_by_pile_top());
800
801- pile_ent->pile_top=n; /* stack the entry */
802+ pile_ent->pile_top=tmp_n; /* stack the entry */
803 pile_ent->pile_top_entry=ent;
804
805 /* if not the first pile, link entry to top of the preceding pile */
806@@ -164,7 +164,7 @@
807 */
808
809 entry* ent=entries()[num_piles-1].pile_top_entry;
810- for(std::size_t n=num_piles;n--;){
811+ for(std::size_t tmp_n=num_piles;tmp_n--;){
812 ent->ordered=true;
813 ent=ent->previous;
814 }
815diff -ru boost_1_39_0/boost/multi_index/ordered_index.hpp boost_1_39_0.patched/boost/multi_index/ordered_index.hpp
816--- boost_1_39_0/boost/multi_index/ordered_index.hpp 2008-07-03 18:51:53.000000000 +0200
817+++ boost_1_39_0.patched/boost/multi_index/ordered_index.hpp 2009-06-23 15:18:03.000000000 +0200
818@@ -436,9 +436,9 @@
819
820 template<typename CompatibleKey,typename CompatibleCompare>
821 iterator find(
822- const CompatibleKey& x,const CompatibleCompare& comp)const
823+ const CompatibleKey& x,const CompatibleCompare& arg_comp) const
824 {
825- return make_iterator(ordered_index_find(root(),header(),key,x,comp));
826+ return make_iterator(ordered_index_find(root(),header(),key,x,arg_comp));
827 }
828
829 template<typename CompatibleKey>
830@@ -448,9 +448,9 @@
831 }
832
833 template<typename CompatibleKey,typename CompatibleCompare>
834- size_type count(const CompatibleKey& x,const CompatibleCompare& comp)const
835+ size_type count(const CompatibleKey& x,const CompatibleCompare& arg_comp) const
836 {
837- std::pair<iterator,iterator> p=equal_range(x,comp);
838+ std::pair<iterator,iterator> p=equal_range(x,arg_comp);
839 size_type n=std::distance(p.first,p.second);
840 return n;
841 }
842@@ -464,10 +464,10 @@
843
844 template<typename CompatibleKey,typename CompatibleCompare>
845 iterator lower_bound(
846- const CompatibleKey& x,const CompatibleCompare& comp)const
847+ const CompatibleKey& x,const CompatibleCompare& arg_comp) const
848 {
849 return make_iterator(
850- ordered_index_lower_bound(root(),header(),key,x,comp));
851+ ordered_index_lower_bound(root(),header(),key,x,arg_comp));
852 }
853
854 template<typename CompatibleKey>
855@@ -479,10 +479,10 @@
856
857 template<typename CompatibleKey,typename CompatibleCompare>
858 iterator upper_bound(
859- const CompatibleKey& x,const CompatibleCompare& comp)const
860+ const CompatibleKey& x,const CompatibleCompare& arg_comp) const
861 {
862 return make_iterator(
863- ordered_index_upper_bound(root(),header(),key,x,comp));
864+ ordered_index_upper_bound(root(),header(),key,x,arg_comp));
865 }
866
867 template<typename CompatibleKey>
868@@ -497,10 +497,10 @@
869
870 template<typename CompatibleKey,typename CompatibleCompare>
871 std::pair<iterator,iterator> equal_range(
872- const CompatibleKey& x,const CompatibleCompare& comp)const
873+ const CompatibleKey& x,const CompatibleCompare& arg_comp) const
874 {
875 std::pair<node_type*,node_type*> p=
876- ordered_index_equal_range(root(),header(),key,x,comp);
877+ ordered_index_equal_range(root(),header(),key,x,arg_comp);
878 return std::pair<iterator,iterator>(
879 make_iterator(p.first),make_iterator(p.second));
880 }
881diff -ru boost_1_39_0/boost/multi_index/sequenced_index.hpp boost_1_39_0.patched/boost/multi_index/sequenced_index.hpp
882--- boost_1_39_0/boost/multi_index/sequenced_index.hpp 2008-07-03 18:51:53.000000000 +0200
883+++ boost_1_39_0.patched/boost/multi_index/sequenced_index.hpp 2009-06-23 15:18:03.000000000 +0200
884@@ -346,7 +346,7 @@
885 }
886
887 template<typename Modifier,typename Rollback>
888- bool modify(iterator position,Modifier mod,Rollback back)
889+ bool modify(iterator position,Modifier mod,Rollback arg_back)
890 {
891 BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position);
892 BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position);
893@@ -363,7 +363,7 @@
894 #endif
895
896 return this->final_modify_(
897- mod,back,static_cast<final_node_type*>(position.get_node()));
898+ mod,arg_back,static_cast<final_node_type*>(position.get_node()));
899 }
900
901 void swap(sequenced_index<SuperMeta,TagList>& x)
902diff -ru boost_1_39_0/boost/multi_index_container.hpp boost_1_39_0.patched/boost/multi_index_container.hpp
903--- boost_1_39_0/boost/multi_index_container.hpp 2008-09-14 18:36:06.000000000 +0200
904+++ boost_1_39_0.patched/boost/multi_index_container.hpp 2009-06-23 15:18:03.000000000 +0200
905@@ -357,7 +357,7 @@
906 IteratorType it
907 BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N))
908 {
909- typedef typename nth_index<N>::type index;
910+ typedef typename nth_index<N>::type N_Index;
911
912 #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
913 BOOST_STATIC_ASSERT(
914@@ -368,7 +368,7 @@
915 BOOST_MULTI_INDEX_CHECK_IS_OWNER(
916 it,static_cast<typename IteratorType::container_type&>(*this));
917
918- return index::make_iterator(static_cast<node_type*>(it.get_node()));
919+ return N_Index::make_iterator(static_cast<node_type*>(it.get_node()));
920 }
921
922 template<int N,typename IteratorType>
923@@ -376,7 +376,7 @@
924 IteratorType it
925 BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N))const
926 {
927- typedef typename nth_index<N>::type index;
928+ typedef typename nth_index<N>::type N_Index;
929
930 #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
931 BOOST_STATIC_ASSERT((
932@@ -387,7 +387,7 @@
933 BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it);
934 BOOST_MULTI_INDEX_CHECK_IS_OWNER(
935 it,static_cast<const typename IteratorType::container_type&>(*this));
936- return index::make_iterator(static_cast<node_type*>(it.get_node()));
937+ return N_Index::make_iterator(static_cast<node_type*>(it.get_node()));
938 }
939 #endif
940
941@@ -411,7 +411,7 @@
942 IteratorType it
943 BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))
944 {
945- typedef typename index<Tag>::type index;
946+ typedef typename index<Tag>::type Tag_Index;
947
948 #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
949 BOOST_STATIC_ASSERT(
950@@ -421,7 +421,7 @@
951 BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it);
952 BOOST_MULTI_INDEX_CHECK_IS_OWNER(
953 it,static_cast<typename IteratorType::container_type&>(*this));
954- return index::make_iterator(static_cast<node_type*>(it.get_node()));
955+ return Tag_Index::make_iterator(static_cast<node_type*>(it.get_node()));
956 }
957
958 template<typename Tag,typename IteratorType>
959@@ -429,7 +429,7 @@
960 IteratorType it
961 BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))const
962 {
963- typedef typename index<Tag>::type index;
964+ typedef typename index<Tag>::type Tag_Index;
965
966 #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
967 BOOST_STATIC_ASSERT((
968@@ -440,7 +440,7 @@
969 BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it);
970 BOOST_MULTI_INDEX_CHECK_IS_OWNER(
971 it,static_cast<const typename IteratorType::container_type&>(*this));
972- return index::make_iterator(static_cast<node_type*>(it.get_node()));
973+ return Tag_Index::make_iterator(static_cast<node_type*>(it.get_node()));
974 }
975 #endif
976
977diff -ru boost_1_39_0/boost/program_options/detail/parsers.hpp boost_1_39_0.patched/boost/program_options/detail/parsers.hpp
978--- boost_1_39_0/boost/program_options/detail/parsers.hpp 2008-02-20 15:55:25.000000000 +0100
979+++ boost_1_39_0.patched/boost/program_options/detail/parsers.hpp 2009-06-23 15:18:03.000000000 +0200
980@@ -27,8 +27,8 @@
981 template<class charT>
982 basic_command_line_parser<charT>::
983 basic_command_line_parser(const std::vector<
984- std::basic_string<charT> >& args)
985- : detail::cmdline(to_internal(args))
986+ std::basic_string<charT> >& arg_args)
987+ : detail::cmdline(to_internal(arg_args))
988 {}
989
990
991@@ -62,9 +62,9 @@
992
993 template<class charT>
994 basic_command_line_parser<charT>&
995- basic_command_line_parser<charT>::style(int style)
996+ basic_command_line_parser<charT>::style(int arg_style)
997 {
998- detail::cmdline::style(style);
999+ detail::cmdline::style(arg_style);
1000 return *this;
1001 }
1002
1003diff -ru boost_1_39_0/boost/program_options/detail/value_semantic.hpp boost_1_39_0.patched/boost/program_options/detail/value_semantic.hpp
1004--- boost_1_39_0/boost/program_options/detail/value_semantic.hpp 2007-11-25 19:07:19.000000000 +0100
1005+++ boost_1_39_0.patched/boost/program_options/detail/value_semantic.hpp 2009-06-23 15:18:03.000000000 +0200
1006@@ -144,9 +144,9 @@
1007 a validator for class T, we use it even
1008 when parsing vector<T>. */
1009 boost::any a;
1010- std::vector<std::basic_string<charT> > v;
1011- v.push_back(s[i]);
1012- validate(a, v, (T*)0, 0);
1013+ std::vector<std::basic_string<charT> > tmp_v;
1014+ tmp_v.push_back(s[i]);
1015+ validate(a, tmp_v, (T*)0, 0);
1016 tv->push_back(boost::any_cast<T>(a));
1017 }
1018 catch(const bad_lexical_cast& /*e*/) {
1019diff -ru boost_1_39_0/boost/program_options/errors.hpp boost_1_39_0.patched/boost/program_options/errors.hpp
1020--- boost_1_39_0/boost/program_options/errors.hpp 2006-05-15 16:06:24.000000000 +0200
1021+++ boost_1_39_0.patched/boost/program_options/errors.hpp 2009-06-23 15:18:03.000000000 +0200
1022@@ -20,14 +20,14 @@
1023 /** Base class for all errors in the library. */
1024 class BOOST_PROGRAM_OPTIONS_DECL error : public std::logic_error {
1025 public:
1026- error(const std::string& what) : std::logic_error(what) {}
1027+ error(const std::string& arg_what) : std::logic_error(arg_what) {}
1028 };
1029
1030 class BOOST_PROGRAM_OPTIONS_DECL invalid_syntax : public error {
1031 public:
1032- invalid_syntax(const std::string& tokens, const std::string& msg)
1033- : error(std::string(msg).append(" in '").append(tokens).append("'")),
1034- tokens(tokens), msg(msg)
1035+ invalid_syntax(const std::string& arg_tokens, const std::string& arg_msg)
1036+ : error(std::string(arg_msg).append(" in '").append(arg_tokens).append("'")),
1037+ tokens(arg_tokens), msg(arg_msg)
1038 {}
1039
1040 // gcc says that throw specification on dtor is loosened
1041@@ -50,9 +50,9 @@
1042 class BOOST_PROGRAM_OPTIONS_DECL ambiguous_option : public error {
1043 public:
1044 ambiguous_option(const std::string& name,
1045- const std::vector<std::string>& alternatives)
1046+ const std::vector<std::string>& arg_alternatives)
1047 : error(std::string("ambiguous option ").append(name)),
1048- alternatives(alternatives)
1049+ alternatives(arg_alternatives)
1050 {}
1051
1052 ~ambiguous_option() throw() {}
1053@@ -65,7 +65,7 @@
1054 user called a method which cannot return them all. */
1055 class BOOST_PROGRAM_OPTIONS_DECL multiple_values : public error {
1056 public:
1057- multiple_values(const std::string& what) : error(what) {}
1058+ multiple_values(const std::string& arg_what) : error(arg_what) {}
1059 };
1060
1061 /** Class thrown when there are several occurrences of an
1062@@ -73,13 +73,13 @@
1063 them all. */
1064 class BOOST_PROGRAM_OPTIONS_DECL multiple_occurrences : public error {
1065 public:
1066- multiple_occurrences(const std::string& what) : error(what) {}
1067+ multiple_occurrences(const std::string& arg_what) : error(arg_what) {}
1068 };
1069
1070 /** Class thrown when value of option is incorrect. */
1071 class BOOST_PROGRAM_OPTIONS_DECL validation_error : public error {
1072 public:
1073- validation_error(const std::string& what) : error(what) {}
1074+ validation_error(const std::string& arg_what) : error(arg_what) {}
1075 ~validation_error() throw() {}
1076 void set_option_name(const std::string& option);
1077
1078@@ -103,15 +103,15 @@
1079 /** Class thrown when there are too many positional options. */
1080 class BOOST_PROGRAM_OPTIONS_DECL too_many_positional_options_error : public error {
1081 public:
1082- too_many_positional_options_error(const std::string& what)
1083- : error(what) {}
1084+ too_many_positional_options_error(const std::string& arg_what)
1085+ : error(arg_what) {}
1086 };
1087
1088 /** Class thrown when there are too few positional options. */
1089 class BOOST_PROGRAM_OPTIONS_DECL too_few_positional_options_error : public error {
1090 public:
1091- too_few_positional_options_error(const std::string& what)
1092- : error(what) {}
1093+ too_few_positional_options_error(const std::string& arg_what)
1094+ : error(arg_what) {}
1095 };
1096
1097 class BOOST_PROGRAM_OPTIONS_DECL invalid_command_line_syntax : public invalid_syntax {
1098diff -ru boost_1_39_0/boost/program_options/option.hpp boost_1_39_0.patched/boost/program_options/option.hpp
1099--- boost_1_39_0/boost/program_options/option.hpp 2005-10-27 11:20:16.000000000 +0200
1100+++ boost_1_39_0.patched/boost/program_options/option.hpp 2009-06-23 15:18:03.000000000 +0200
1101@@ -24,9 +24,9 @@
1102 class basic_option {
1103 public:
1104 basic_option() : position_key(-1), unregistered(false) {}
1105- basic_option(const std::string& string_key,
1106- const std::vector< std::string> &value)
1107- : string_key(string_key), value(value), unregistered(false)
1108+ basic_option(const std::string& arg_string_key,
1109+ const std::vector< std::string> &arg_value)
1110+ : string_key(arg_string_key), value(arg_value), unregistered(false)
1111 {}
1112
1113 /** String key of this option. Intentionally independent of the template
1114diff -ru boost_1_39_0/boost/program_options/options_description.hpp boost_1_39_0.patched/boost/program_options/options_description.hpp
1115--- boost_1_39_0/boost/program_options/options_description.hpp 2007-11-25 19:07:19.000000000 +0100
1116+++ boost_1_39_0.patched/boost/program_options/options_description.hpp 2009-06-23 15:18:03.000000000 +0200
1117@@ -234,7 +234,7 @@
1118 /** Class thrown when duplicate option description is found. */
1119 class BOOST_PROGRAM_OPTIONS_DECL duplicate_option_error : public error {
1120 public:
1121- duplicate_option_error(const std::string& what) : error(what) {}
1122+ duplicate_option_error(const std::string& arg_what) : error(arg_what) {}
1123 };
1124 }}
1125
1126diff -ru boost_1_39_0/boost/program_options/parsers.hpp boost_1_39_0.patched/boost/program_options/parsers.hpp
1127--- boost_1_39_0/boost/program_options/parsers.hpp 2007-11-25 19:07:19.000000000 +0100
1128+++ boost_1_39_0.patched/boost/program_options/parsers.hpp 2009-06-23 15:18:03.000000000 +0200
1129@@ -31,8 +31,8 @@
1130 template<class charT>
1131 class basic_parsed_options {
1132 public:
1133- explicit basic_parsed_options(const options_description* description)
1134- : description(description) {}
1135+ explicit basic_parsed_options(const options_description* arg_description)
1136+ : description(arg_description) {}
1137 /** Options found in the source. */
1138 std::vector< basic_option<charT> > options;
1139 /** Options description that was used for parsing.
1140diff -ru boost_1_39_0/boost/program_options/variables_map.hpp boost_1_39_0.patched/boost/program_options/variables_map.hpp
1141--- boost_1_39_0/boost/program_options/variables_map.hpp 2007-11-25 19:07:19.000000000 +0100
1142+++ boost_1_39_0.patched/boost/program_options/variables_map.hpp 2009-06-23 15:18:03.000000000 +0200
1143@@ -53,8 +53,8 @@
1144 class BOOST_PROGRAM_OPTIONS_DECL variable_value {
1145 public:
1146 variable_value() : m_defaulted(false) {}
1147- variable_value(const boost::any& v, bool defaulted)
1148- : v(v), m_defaulted(defaulted)
1149+ variable_value(const boost::any& arg_v, bool arg_defaulted)
1150+ : v(arg_v), m_defaulted(arg_defaulted)
1151 {}
1152
1153 /** If stored value if of type T, returns that value. Otherwise,
1154diff -ru boost_1_39_0/boost/serialization/nvp.hpp boost_1_39_0.patched/boost/serialization/nvp.hpp
1155--- boost_1_39_0/boost/serialization/nvp.hpp 2007-11-25 19:07:19.000000000 +0100
1156+++ boost_1_39_0.patched/boost/serialization/nvp.hpp 2009-06-23 15:18:03.000000000 +0200
1157@@ -43,7 +43,7 @@
1158 public std::pair<const char *, T *>,
1159 public wrapper_traits<nvp<T> >
1160 {
1161- explicit nvp(const char * name, T & t) :
1162+ explicit nvp(const char * name_, T & t) :
1163 // note: redundant cast works around borland issue
1164 std::pair<const char *, T *>(name, (T*)(& t))
1165 {}
1166diff -ru boost_1_39_0/boost/signal.hpp boost_1_39_0.patched/boost/signal.hpp
1167--- boost_1_39_0/boost/signal.hpp 2006-04-10 21:31:55.000000000 +0200
1168+++ boost_1_39_0.patched/boost/signal.hpp 2009-06-23 15:18:03.000000000 +0200
1169@@ -341,9 +341,9 @@
1170 SlotFunction>::type base_type;
1171
1172 public:
1173- explicit signal(const Combiner& combiner = Combiner(),
1174+ explicit signal(const Combiner& arg_combiner = Combiner(),
1175 const GroupCompare& group_compare = GroupCompare()) :
1176- base_type(combiner, group_compare)
1177+ base_type(arg_combiner, group_compare)
1178 {
1179 }
1180 };
1181diff -ru boost_1_39_0/boost/signals/detail/named_slot_map.hpp boost_1_39_0.patched/boost/signals/detail/named_slot_map.hpp
1182--- boost_1_39_0/boost/signals/detail/named_slot_map.hpp 2007-12-14 15:48:14.000000000 +0100
1183+++ boost_1_39_0.patched/boost/signals/detail/named_slot_map.hpp 2009-06-23 15:18:03.000000000 +0200
1184@@ -32,10 +32,10 @@
1185 public:
1186 enum storage_kind { sk_empty, sk_front, sk_back, sk_group };
1187
1188- stored_group(storage_kind kind = sk_empty) : kind(kind), group() { }
1189+ stored_group(storage_kind arg_kind = sk_empty) : kind(arg_kind), group() { }
1190
1191 template<typename T>
1192- stored_group(const T& group) : kind(sk_group), group(new T(group)) { }
1193+ stored_group(const T& arg_group) : kind(sk_group), group(new T(arg_group)) { }
1194
1195 bool is_front() const { return kind == sk_front; }
1196 bool is_back() const { return kind == sk_back; }
1197@@ -133,12 +133,12 @@
1198 #endif
1199
1200 private:
1201- named_slot_map_iterator(group_iterator group, group_iterator last) :
1202- group(group), last_group(last), slot_assigned(false)
1203+ named_slot_map_iterator(group_iterator arg_group, group_iterator arg_last) :
1204+ group(arg_group), last_group(arg_last), slot_assigned(false)
1205 { init_next_group(); }
1206- named_slot_map_iterator(group_iterator group, group_iterator last,
1207- slot_pair_iterator slot) :
1208- group(group), last_group(last), slot_(slot), slot_assigned(true)
1209+ named_slot_map_iterator(group_iterator arg_group, group_iterator arg_last,
1210+ slot_pair_iterator arg_slot) :
1211+ group(arg_group), last_group(arg_last), slot_(arg_slot), slot_assigned(true)
1212 { }
1213
1214 void init_next_group()
1215diff -ru boost_1_39_0/boost/signals/detail/slot_call_iterator.hpp boost_1_39_0.patched/boost/signals/detail/slot_call_iterator.hpp
1216--- boost_1_39_0/boost/signals/detail/slot_call_iterator.hpp 2005-02-20 00:44:26.000000000 +0100
1217+++ boost_1_39_0.patched/boost/signals/detail/slot_call_iterator.hpp 2009-06-23 15:18:03.000000000 +0200
1218@@ -47,9 +47,9 @@
1219 friend class iterator_core_access;
1220
1221 public:
1222- slot_call_iterator(Iterator iter_in, Iterator end_in, Function f,
1223+ slot_call_iterator(Iterator iter_in, Iterator end_in, Function arg_f,
1224 optional<result_type> &c)
1225- : iter(iter_in), end(end_in), f(f), cache(&c)
1226+ : iter(iter_in), end(end_in), f(arg_f), cache(&c)
1227 {
1228 iter = std::find_if(iter, end, is_callable());
1229 }
1230diff -ru boost_1_39_0/boost/signals/signal_template.hpp boost_1_39_0.patched/boost/signals/signal_template.hpp
1231--- boost_1_39_0/boost/signals/signal_template.hpp 2006-09-21 20:16:36.000000000 +0200
1232+++ boost_1_39_0.patched/boost/signals/signal_template.hpp 2009-06-23 15:18:03.000000000 +0200
1233@@ -345,8 +345,8 @@
1234 #endif // BOOST_SIGNALS_NUM_ARGS > 0
1235 call_bound_slot f(&args);
1236
1237- typedef typename call_bound_slot::result_type result_type;
1238- optional<result_type> cache;
1239+ typedef typename call_bound_slot::result_type x_result_type;
1240+ optional<x_result_type> cache;
1241 // Let the combiner call the slots via a pair of input iterators
1242 return combiner()(slot_call_iterator(notification.impl->slots_.begin(),
1243 impl->slots_.end(), f, cache),
1244@@ -386,8 +386,8 @@
1245
1246 call_bound_slot f(&args);
1247
1248- typedef typename call_bound_slot::result_type result_type;
1249- optional<result_type> cache;
1250+ typedef typename call_bound_slot::result_type y_result_type;
1251+ optional<y_result_type> cache;
1252
1253 // Let the combiner call the slots via a pair of input iterators
1254 return combiner()(slot_call_iterator(notification.impl->slots_.begin(),
1255diff -ru boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp boost_1_39_0.patched/boost/spirit/home/classic/core/impl/match.ipp
1256--- boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp 2008-06-22 17:05:38.000000000 +0200
1257+++ boost_1_39_0.patched/boost/spirit/home/classic/core/impl/match.ipp 2009-06-23 15:18:04.000000000 +0200
1258@@ -19,12 +19,12 @@
1259 : len(-1), val() {}
1260
1261 template <typename T>
1262- inline match<T>::match(std::size_t length)
1263- : len(length), val() {}
1264+ inline match<T>::match(std::size_t arg_length)
1265+ : len(arg_length), val() {}
1266
1267 template <typename T>
1268- inline match<T>::match(std::size_t length, ctor_param_t val_)
1269- : len(length), val(val_) {}
1270+ inline match<T>::match(std::size_t arg_length, ctor_param_t val_)
1271+ : len(arg_length), val(val_) {}
1272
1273 template <typename T>
1274 inline bool
1275@@ -66,11 +66,11 @@
1276 inline match<nil_t>::match()
1277 : len(-1) {}
1278
1279- inline match<nil_t>::match(std::size_t length)
1280- : len(length) {}
1281+ inline match<nil_t>::match(std::size_t arg_length)
1282+ : len(arg_length) {}
1283
1284- inline match<nil_t>::match(std::size_t length, nil_t)
1285- : len(length) {}
1286+ inline match<nil_t>::match(std::size_t arg_length, nil_t)
1287+ : len(arg_length) {}
1288
1289 inline bool
1290 match<nil_t>::operator!() const
1291diff -ru boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp boost_1_39_0.patched/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
1292--- boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp 2008-06-22 17:05:38.000000000 +0200
1293+++ boost_1_39_0.patched/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp 2009-06-23 15:18:04.000000000 +0200
1294@@ -226,7 +226,7 @@
1295 template <typename ParserT, typename ScannerT, typename AttrT>
1296 struct concrete_parser : abstract_parser<ScannerT, AttrT>
1297 {
1298- concrete_parser(ParserT const& p) : p(p) {}
1299+ concrete_parser(ParserT const& arg_p) : p(arg_p) {}
1300 virtual ~concrete_parser() {}
1301
1302 virtual typename match_result<ScannerT, AttrT>::type
1303diff -ru boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp boost_1_39_0.patched/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
1304--- boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp 2008-06-22 17:05:38.000000000 +0200
1305+++ boost_1_39_0.patched/boost/spirit/home/classic/core/non_terminal/parser_id.hpp 2009-06-23 15:18:04.000000000 +0200
1306@@ -106,7 +106,7 @@
1307 : parser_id(reinterpret_cast<std::size_t>(this));
1308 }
1309
1310- void set_id(parser_id id) { tag = id; }
1311+ void set_id(parser_id arg_id) { tag = arg_id; }
1312
1313 private:
1314
1315diff -ru boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp boost_1_39_0.patched/boost/spirit/home/classic/core/non_terminal/rule.hpp
1316--- boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp 2008-06-22 17:05:38.000000000 +0200
1317+++ boost_1_39_0.patched/boost/spirit/home/classic/core/non_terminal/rule.hpp 2009-06-23 15:18:04.000000000 +0200
1318@@ -159,11 +159,11 @@
1319 return ptr.get();
1320 }
1321
1322- rule(abstract_parser_t* ptr)
1323- : ptr(ptr) {}
1324+ rule(abstract_parser_t* arg_ptr)
1325+ : ptr(arg_ptr) {}
1326
1327- rule(abstract_parser_t const* ptr)
1328- : ptr(ptr) {}
1329+ rule(abstract_parser_t const* arg_ptr)
1330+ : ptr(arg_ptr) {}
1331
1332 scoped_ptr<abstract_parser_t> ptr;
1333 };
1334diff -ru boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp boost_1_39_0.patched/boost/spirit/home/classic/core/non_terminal/subrule.hpp
1335--- boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2008-06-22 17:05:38.000000000 +0200
1336+++ boost_1_39_0.patched/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2009-06-23 15:18:04.000000000 +0200
1337@@ -210,7 +210,7 @@
1338 subrule_list<
1339 subrule_parser<ID2, DefT2, ContextT2>,
1340 nil_t> >
1341- operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const
1342+ operator,(subrule_parser<ID2, DefT2, ContextT2> const& arg_rhs) const
1343 {
1344 return subrule_list<
1345 self_t,
1346@@ -220,7 +220,7 @@
1347 *this,
1348 subrule_list<
1349 subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
1350- rhs, nil_t()));
1351+ arg_rhs, nil_t()));
1352 }
1353
1354 typename DefT::embed_t rhs;
1355@@ -258,10 +258,10 @@
1356 parse_main(ScannerT const& scan) const
1357 {
1358 typedef typename parser_result<self_t, ScannerT>::type result_t;
1359- result_t result;
1360+ result_t tmp_result;
1361 impl::parse_subrule<result_t, ScannerT, ID>::
1362- do_(result, scan);
1363- return result;
1364+ do_(tmp_result, scan);
1365+ return tmp_result;
1366 }
1367
1368 template <typename ScannerT>
1369diff -ru boost_1_39_0/boost/spirit/home/classic/tree/common.hpp boost_1_39_0.patched/boost/spirit/home/classic/tree/common.hpp
1370--- boost_1_39_0/boost/spirit/home/classic/tree/common.hpp 2008-06-22 17:05:38.000000000 +0200
1371+++ boost_1_39_0.patched/boost/spirit/home/classic/tree/common.hpp 2009-06-23 15:18:04.000000000 +0200
1372@@ -555,18 +555,18 @@
1373 {}
1374
1375 explicit
1376- tree_match(std::size_t length)
1377- : match<T>(length), trees()
1378+ tree_match(std::size_t arg_length)
1379+ : match<T>(arg_length), trees()
1380 {}
1381
1382- tree_match(std::size_t length, parse_node_t const& n)
1383- : match<T>(length), trees()
1384+ tree_match(std::size_t arg_length, parse_node_t const& n)
1385+ : match<T>(arg_length), trees()
1386 {
1387 trees.push_back(node_t(n));
1388 }
1389
1390- tree_match(std::size_t length, param_type val, parse_node_t const& n)
1391- : match<T>(length, val), trees()
1392+ tree_match(std::size_t arg_length, param_type arg_val, parse_node_t const& n)
1393+ : match<T>(arg_length, arg_val), trees()
1394 {
1395 #if !defined(BOOST_SPIRIT_USE_LIST_FOR_TREES)
1396 trees.reserve(10); // this is more or less an arbitrary number...
1397@@ -575,14 +575,14 @@
1398 }
1399
1400 // attention, these constructors will change the second parameter!
1401- tree_match(std::size_t length, container_t& c)
1402- : match<T>(length), trees()
1403+ tree_match(std::size_t arg_length, container_t& c)
1404+ : match<T>(arg_length), trees()
1405 {
1406 impl::cp_swap(trees, c);
1407 }
1408
1409- tree_match(std::size_t length, param_type val, container_t& c)
1410- : match<T>(length, val), trees()
1411+ tree_match(std::size_t arg_length, param_type val, container_t& c)
1412+ : match<T>(arg_length, val), trees()
1413 {
1414 impl::cp_swap(trees, c);
1415 }
1416diff -ru boost_1_39_0/boost/test/utils/lazy_ostream.hpp boost_1_39_0.patched/boost/test/utils/lazy_ostream.hpp
1417--- boost_1_39_0/boost/test/utils/lazy_ostream.hpp 2008-10-13 10:20:26.000000000 +0200
1418+++ boost_1_39_0.patched/boost/test/utils/lazy_ostream.hpp 2009-06-23 15:18:03.000000000 +0200
1419@@ -45,7 +45,7 @@
1420 // actual printing interface; to be accessed only by this class and children
1421 virtual std::ostream& operator()( std::ostream& ostr ) const { return ostr; }
1422 protected:
1423- explicit lazy_ostream( bool empty = true ) : m_empty( empty ) {}
1424+ explicit lazy_ostream( bool arg_empty = true ) : m_empty( arg_empty ) {}
1425
1426 // protected destructor to make sure right one is called
1427 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x582))
1428diff -ru boost_1_39_0/boost/variant/variant.hpp boost_1_39_0.patched/boost/variant/variant.hpp
1429--- boost_1_39_0/boost/variant/variant.hpp 2007-11-25 19:07:19.000000000 +0100
1430+++ boost_1_39_0.patched/boost/variant/variant.hpp 2009-06-23 15:18:03.000000000 +0200
1431@@ -1112,14 +1112,14 @@
1432 which_t which_;
1433 storage_t storage_;
1434
1435- void indicate_which(int which)
1436+ void indicate_which(int arg_which)
1437 {
1438- which_ = static_cast<which_t>( which );
1439+ which_ = static_cast<which_t>( arg_which );
1440 }
1441
1442- void indicate_backup_which(int which)
1443+ void indicate_backup_which(int arg_which)
1444 {
1445- which_ = static_cast<which_t>( -(which + 1) );
1446+ which_ = static_cast<which_t>( -(arg_which + 1) );
1447 }
1448
1449 private: // helpers, for queries (below)