1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
diff -ru boost.orig/boost/iostreams/detail/buffer.hpp boost/boost/iostreams/detail/buffer.hpp
--- foo/misc/boost.orig/boost/iostreams/detail/buffer.hpp 2015-07-19 12:06:22.159924201 +0200
+++ foo/misc/boost/boost/iostreams/detail/buffer.hpp 2015-07-19 12:07:32.000923416 +0200
@@ -179,9 +179,9 @@
: basic_buffer<Ch, Alloc>(buffer_size) { }
template<typename Ch, typename Alloc>
-inline void buffer<Ch, Alloc>::set(std::streamsize ptr, std::streamsize end)
+inline void buffer<Ch, Alloc>::set(std::streamsize ptr_arg, std::streamsize end)
{
- ptr_ = data() + ptr;
+ ptr_ = data() + ptr_arg;
eptr_ = data() + end;
}
diff -ru boost.orig/boost/iostreams/filter/gzip.hpp boost/boost/iostreams/filter/gzip.hpp
--- foo/misc/boost.orig/boost/iostreams/filter/gzip.hpp 2015-01-25 20:33:40.000000000 +0100
+++ foo/misc/boost/boost/iostreams/filter/gzip.hpp 2015-07-19 12:23:11.208912860 +0200
@@ -135,16 +135,16 @@
struct gzip_params : zlib_params {
// Non-explicit constructor.
- gzip_params( int level = gzip::default_compression,
- int method = gzip::deflated,
- int window_bits = gzip::default_window_bits,
- int mem_level = gzip::default_mem_level,
- int strategy = gzip::default_strategy,
- std::string file_name = "",
- std::string comment = "",
- std::time_t mtime = 0 )
- : zlib_params(level, method, window_bits, mem_level, strategy),
- file_name(file_name), comment(comment), mtime(mtime)
+ gzip_params( int level_ = gzip::default_compression,
+ int method_ = gzip::deflated,
+ int window_bits_ = gzip::default_window_bits,
+ int mem_level_ = gzip::default_mem_level,
+ int strategy_ = gzip::default_strategy,
+ std::string file_name_ = "",
+ std::string comment_ = "",
+ std::time_t mtime_ = 0 )
+ : zlib_params(level_, method_, window_bits_, mem_level_, strategy_),
+ file_name(file_name_), comment(comment_), mtime(mtime_)
{ }
std::string file_name;
std::string comment;
@@ -160,9 +160,9 @@
//
class gzip_error : public BOOST_IOSTREAMS_FAILURE {
public:
- explicit gzip_error(int error)
+ explicit gzip_error(int error_arg)
: BOOST_IOSTREAMS_FAILURE("gzip error"),
- error_(error), zlib_error_code_(zlib::okay) { }
+ error_(error_arg), zlib_error_code_(zlib::okay) { }
explicit gzip_error(const zlib_error& e)
: BOOST_IOSTREAMS_FAILURE("gzip error"),
error_(gzip::zlib_error), zlib_error_code_(e.error())
@@ -505,8 +505,8 @@
if (footer_.done()) {
if (footer_.crc() != this->crc())
boost::throw_exception(gzip_error(gzip::bad_crc));
- int c = boost::iostreams::get(peek);
- if (traits_type::is_eof(c)) {
+ int c2 = boost::iostreams::get(peek);
+ if (traits_type::is_eof(c2)) {
state_ = s_done;
} else {
peek.putback(c);
@@ -567,8 +567,8 @@
struct peekable_source {
typedef char char_type;
struct category : source_tag, peekable_tag { };
- explicit peekable_source(Source& src, const string_type& putback = "")
- : src_(src), putback_(putback), offset_(0)
+ explicit peekable_source(Source& src, const string_type& putback_arg = "")
+ : src_(src), putback_(putback_arg), offset_(0)
{ }
std::streamsize read(char* s, std::streamsize n)
{
diff -ru boost.orig/boost/iostreams/filter/symmetric.hpp boost/boost/iostreams/filter/symmetric.hpp
--- foo/misc/boost.orig/boost/iostreams/filter/symmetric.hpp 2015-01-25 20:33:40.000000000 +0100
+++ foo/misc/boost/boost/iostreams/filter/symmetric.hpp 2015-07-19 12:11:10.202920964 +0200
@@ -102,7 +102,7 @@
if (!(state() & f_read))
begin_read();
- buffer_type& buf = pimpl_->buf_;
+ buffer_type& buf_l = pimpl_->buf_;
int status = (state() & f_eof) != 0 ? f_eof : f_good;
char_type *next_s = s,
*end_s = s + n;
@@ -110,12 +110,12 @@
{
// Invoke filter if there are unconsumed characters in buffer or if
// filter must be flushed.
- bool flush = status == f_eof;
- if (buf.ptr() != buf.eptr() || flush) {
- const char_type* next = buf.ptr();
+ bool flush_l = status == f_eof;
+ if (buf_l.ptr() != buf_l.eptr() || flush_l) {
+ const char_type* next = buf_l.ptr();
bool done =
- !filter().filter(next, buf.eptr(), next_s, end_s, flush);
- buf.ptr() = buf.data() + (next - buf.data());
+ !filter().filter(next, buf_l.eptr(), next_s, end_s, flush_l);
+ buf_l.ptr() = buf_l.data() + (next - buf_l.data());
if (done)
return detail::check_eof(
static_cast<std::streamsize>(next_s - s)
@@ -124,7 +124,7 @@
// If no more characters are available without blocking, or
// if read request has been satisfied, return.
- if ( (status == f_would_block && buf.ptr() == buf.eptr()) ||
+ if ( (status == f_would_block && buf_l.ptr() == buf_l.eptr()) ||
next_s == end_s )
{
return static_cast<std::streamsize>(next_s - s);
@@ -142,12 +142,12 @@
if (!(state() & f_write))
begin_write();
- buffer_type& buf = pimpl_->buf_;
+ buffer_type& buf_l = pimpl_->buf_;
const char_type *next_s, *end_s;
for (next_s = s, end_s = s + n; next_s != end_s; ) {
- if (buf.ptr() == buf.eptr() && !flush(snk))
+ if (buf_l.ptr() == buf_l.eptr() && !flush(snk))
break;
- if(!filter().filter(next_s, end_s, buf.ptr(), buf.eptr(), false)) {
+ if(!filter().filter(next_s, end_s, buf_l.ptr(), buf_l.eptr(), false)) {
flush(snk);
break;
}
@@ -165,14 +165,14 @@
// Repeatedly invoke filter() with no input.
try {
- buffer_type& buf = pimpl_->buf_;
+ buffer_type& buf_l = pimpl_->buf_;
char_type dummy;
const char_type* end = &dummy;
bool again = true;
while (again) {
- if (buf.ptr() != buf.eptr())
- again = filter().filter( end, end, buf.ptr(),
- buf.eptr(), true );
+ if (buf_l.ptr() != buf_l.eptr())
+ again = filter().filter( end, end, buf_l.ptr(),
+ buf_l.eptr(), true );
flush(snk);
}
} catch (...) {
diff -ru boost.orig/boost/iostreams/filter/zlib.hpp boost/boost/iostreams/filter/zlib.hpp
--- foo/misc/boost.orig/boost/iostreams/filter/zlib.hpp 2015-01-25 20:33:40.000000000 +0100
+++ foo/misc/boost/boost/iostreams/filter/zlib.hpp 2015-07-19 12:13:59.995919056 +0200
@@ -110,16 +110,16 @@
struct zlib_params {
// Non-explicit constructor.
- zlib_params( int level = zlib::default_compression,
- int method = zlib::deflated,
- int window_bits = zlib::default_window_bits,
- int mem_level = zlib::default_mem_level,
- int strategy = zlib::default_strategy,
- bool noheader = zlib::default_noheader,
- bool calculate_crc = zlib::default_crc )
- : level(level), method(method), window_bits(window_bits),
- mem_level(mem_level), strategy(strategy),
- noheader(noheader), calculate_crc(calculate_crc)
+ zlib_params( int level_ = zlib::default_compression,
+ int method_ = zlib::deflated,
+ int window_bits_ = zlib::default_window_bits,
+ int mem_level_ = zlib::default_mem_level,
+ int strategy_ = zlib::default_strategy,
+ bool noheader_ = zlib::default_noheader,
+ bool calculate_crc_ = zlib::default_crc )
+ : level(level_), method(method_), window_bits(window_bits_),
+ mem_level(mem_level_), strategy(strategy_),
+ noheader(noheader_), calculate_crc(calculate_crc_)
{ }
int level;
int method;
diff -ru boost.orig/libs/iostreams/src/zlib.cpp boost/libs/iostreams/src/zlib.cpp
--- foo/misc/boost.orig/libs/iostreams/src/zlib.cpp 2015-01-25 20:33:40.000000000 +0100
+++ foo/misc/boost/libs/iostreams/src/zlib.cpp 2015-07-19 12:14:51.815918473 +0200
@@ -67,8 +67,8 @@
//------------------Implementation of zlib_error------------------------------//
-zlib_error::zlib_error(int error)
- : BOOST_IOSTREAMS_FAILURE("zlib error"), error_(error)
+zlib_error::zlib_error(int error_arg)
+ : BOOST_IOSTREAMS_FAILURE("zlib error"), error_(error_arg)
{ }
void zlib_error::check BOOST_PREVENT_MACRO_SUBSTITUTION(int error)
|
