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
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
|
diff -ru boost.orig/boost/property_tree/detail/json_parser_error.hpp boost/boost/property_tree/detail/json_parser_error.hpp
--- boost.orig/boost/property_tree/detail/json_parser_error.hpp 2015-07-07 14:20:48.000000000 +0200
+++ boost/boost/property_tree/detail/json_parser_error.hpp 2015-07-19 11:16:35.699957767 +0200
@@ -20,10 +20,10 @@
class json_parser_error: public file_parser_error
{
public:
- json_parser_error(const std::string &message,
- const std::string &filename,
- unsigned long line):
- file_parser_error(message, filename, line)
+ json_parser_error(const std::string &message_,
+ const std::string &filename_,
+ unsigned long line_):
+ file_parser_error(message_, filename_, line_)
{
}
};
diff -ru boost.orig/boost/property_tree/detail/ptree_implementation.hpp boost/boost/property_tree/detail/ptree_implementation.hpp
--- boost.orig/boost/property_tree/detail/ptree_implementation.hpp 2015-07-07 14:20:48.000000000 +0200
+++ boost/boost/property_tree/detail/ptree_implementation.hpp 2015-07-18 23:33:04.165906803 +0200
@@ -568,48 +568,48 @@
template<class K, class D, class C>
basic_ptree<K, D, C> &
- basic_ptree<K, D, C>::get_child(const path_type &path)
+ basic_ptree<K, D, C>::get_child(const path_type &path_)
{
- path_type p(path);
+ path_type p(path_);
self_type *n = walk_path(p);
if (!n) {
- BOOST_PROPERTY_TREE_THROW(ptree_bad_path("No such node", path));
+ BOOST_PROPERTY_TREE_THROW(ptree_bad_path("No such node", path_));
}
return *n;
}
template<class K, class D, class C> inline
const basic_ptree<K, D, C> &
- basic_ptree<K, D, C>::get_child(const path_type &path) const
+ basic_ptree<K, D, C>::get_child(const path_type &path_) const
{
- return const_cast<self_type*>(this)->get_child(path);
+ return const_cast<self_type*>(this)->get_child(path_);
}
template<class K, class D, class C> inline
basic_ptree<K, D, C> &
- basic_ptree<K, D, C>::get_child(const path_type &path,
+ basic_ptree<K, D, C>::get_child(const path_type &path_,
self_type &default_value)
{
- path_type p(path);
+ path_type p(path_);
self_type *n = walk_path(p);
return n ? *n : default_value;
}
template<class K, class D, class C> inline
const basic_ptree<K, D, C> &
- basic_ptree<K, D, C>::get_child(const path_type &path,
+ basic_ptree<K, D, C>::get_child(const path_type &path_,
const self_type &default_value) const
{
- return const_cast<self_type*>(this)->get_child(path,
+ return const_cast<self_type*>(this)->get_child(path_,
const_cast<self_type&>(default_value));
}
template<class K, class D, class C>
optional<basic_ptree<K, D, C> &>
- basic_ptree<K, D, C>::get_child_optional(const path_type &path)
+ basic_ptree<K, D, C>::get_child_optional(const path_type &path_)
{
- path_type p(path);
+ path_type p(path_);
self_type *n = walk_path(p);
if (!n) {
return optional<self_type&>();
@@ -619,9 +619,9 @@
template<class K, class D, class C>
optional<const basic_ptree<K, D, C> &>
- basic_ptree<K, D, C>::get_child_optional(const path_type &path) const
+ basic_ptree<K, D, C>::get_child_optional(const path_type &path_) const
{
- path_type p(path);
+ path_type p(path_);
self_type *n = walk_path(p);
if (!n) {
return optional<const self_type&>();
@@ -631,10 +631,10 @@
template<class K, class D, class C>
basic_ptree<K, D, C> &
- basic_ptree<K, D, C>::put_child(const path_type &path,
+ basic_ptree<K, D, C>::put_child(const path_type &path_,
const self_type &value)
{
- path_type p(path);
+ path_type p(path_);
self_type &parent = force_path(p);
// Got the parent. Now get the correct child.
key_type fragment = p.reduce();
@@ -649,10 +649,10 @@
template<class K, class D, class C>
basic_ptree<K, D, C> &
- basic_ptree<K, D, C>::add_child(const path_type &path,
+ basic_ptree<K, D, C>::add_child(const path_type &path_,
const self_type &value)
{
- path_type p(path);
+ path_type p(path_);
self_type &parent = force_path(p);
// Got the parent.
key_type fragment = p.reduce();
@@ -738,26 +738,26 @@
template<class K, class D, class C>
template<class Type, class Translator> inline
typename boost::enable_if<detail::is_translator<Translator>, Type>::type
- basic_ptree<K, D, C>::get(const path_type &path,
+ basic_ptree<K, D, C>::get(const path_type &path_,
Translator tr) const
{
- return get_child(path).BOOST_NESTED_TEMPLATE get_value<Type>(tr);
+ return get_child(path_).BOOST_NESTED_TEMPLATE get_value<Type>(tr);
}
template<class K, class D, class C>
template<class Type> inline
- Type basic_ptree<K, D, C>::get(const path_type &path) const
+ Type basic_ptree<K, D, C>::get(const path_type &path_) const
{
- return get_child(path).BOOST_NESTED_TEMPLATE get_value<Type>();
+ return get_child(path_).BOOST_NESTED_TEMPLATE get_value<Type>();
}
template<class K, class D, class C>
template<class Type, class Translator> inline
- Type basic_ptree<K, D, C>::get(const path_type &path,
+ Type basic_ptree<K, D, C>::get(const path_type &path_,
const Type &default_value,
Translator tr) const
{
- return get_optional<Type>(path, tr).get_value_or(default_value);
+ return get_optional<Type>(path_, tr).get_value_or(default_value);
}
template<class K, class D, class C>
@@ -767,18 +767,18 @@
std::basic_string<Ch>
>::type
basic_ptree<K, D, C>::get(
- const path_type &path, const Ch *default_value, Translator tr) const
+ const path_type &path_, const Ch *default_value, Translator tr) const
{
- return get<std::basic_string<Ch>, Translator>(path, default_value, tr);
+ return get<std::basic_string<Ch>, Translator>(path_, default_value, tr);
}
template<class K, class D, class C>
template<class Type> inline
typename boost::disable_if<detail::is_translator<Type>, Type>::type
- basic_ptree<K, D, C>::get(const path_type &path,
+ basic_ptree<K, D, C>::get(const path_type &path_,
const Type &default_value) const
{
- return get_optional<Type>(path).get_value_or(default_value);
+ return get_optional<Type>(path_).get_value_or(default_value);
}
template<class K, class D, class C>
@@ -788,17 +788,17 @@
std::basic_string<Ch>
>::type
basic_ptree<K, D, C>::get(
- const path_type &path, const Ch *default_value) const
+ const path_type &path_, const Ch *default_value) const
{
- return get< std::basic_string<Ch> >(path, default_value);
+ return get< std::basic_string<Ch> >(path_, default_value);
}
template<class K, class D, class C>
template<class Type, class Translator>
- optional<Type> basic_ptree<K, D, C>::get_optional(const path_type &path,
+ optional<Type> basic_ptree<K, D, C>::get_optional(const path_type &path_,
Translator tr) const
{
- if (optional<const self_type&> child = get_child_optional(path))
+ if (optional<const self_type&> child = get_child_optional(path_))
return child.get().
BOOST_NESTED_TEMPLATE get_value_optional<Type>(tr);
else
@@ -808,9 +808,9 @@
template<class K, class D, class C>
template<class Type>
optional<Type> basic_ptree<K, D, C>::get_optional(
- const path_type &path) const
+ const path_type &path_) const
{
- if (optional<const self_type&> child = get_child_optional(path))
+ if (optional<const self_type&> child = get_child_optional(path_))
return child.get().BOOST_NESTED_TEMPLATE get_value_optional<Type>();
else
return optional<Type>();
@@ -839,13 +839,13 @@
template<class K, class D, class C>
template<class Type, typename Translator>
basic_ptree<K, D, C> & basic_ptree<K, D, C>::put(
- const path_type &path, const Type &value, Translator tr)
+ const path_type &path_, const Type &value, Translator tr)
{
- if(optional<self_type &> child = get_child_optional(path)) {
+ if(optional<self_type &> child = get_child_optional(path_)) {
child.get().put_value(value, tr);
return *child;
} else {
- self_type &child2 = put_child(path, self_type());
+ self_type &child2 = put_child(path_, self_type());
child2.put_value(value, tr);
return child2;
}
@@ -854,18 +854,18 @@
template<class K, class D, class C>
template<class Type> inline
basic_ptree<K, D, C> & basic_ptree<K, D, C>::put(
- const path_type &path, const Type &value)
+ const path_type &path_, const Type &value)
{
- return put(path, value,
+ return put(path_, value,
typename translator_between<data_type, Type>::type());
}
template<class K, class D, class C>
template<class Type, typename Translator> inline
basic_ptree<K, D, C> & basic_ptree<K, D, C>::add(
- const path_type &path, const Type &value, Translator tr)
+ const path_type &path_, const Type &value, Translator tr)
{
- self_type &child = add_child(path, self_type());
+ self_type &child = add_child(path_, self_type());
child.put_value(value, tr);
return child;
}
@@ -873,9 +873,9 @@
template<class K, class D, class C>
template<class Type> inline
basic_ptree<K, D, C> & basic_ptree<K, D, C>::add(
- const path_type &path, const Type &value)
+ const path_type &path_, const Type &value)
{
- return add(path, value,
+ return add(path_, value,
typename translator_between<data_type, Type>::type());
}
diff -ru boost.orig/boost/property_tree/string_path.hpp boost/boost/property_tree/string_path.hpp
--- boost.orig/boost/property_tree/string_path.hpp 2015-07-07 14:20:48.000000000 +0200
+++ boost/boost/property_tree/string_path.hpp 2015-07-18 23:33:41.749906380 +0200
@@ -88,14 +88,14 @@
typedef typename String::value_type char_type;
/// Create an empty path.
- explicit string_path(char_type separator = char_type('.'));
+ explicit string_path(char_type separator_ = char_type('.'));
/// Create a path by parsing the given string.
/// @param value A sequence, possibly with separators, that describes
/// the path, e.g. "one.two.three".
/// @param separator The separator used in parsing. Defaults to '.'.
/// @param tr The translator used by this path to convert the individual
/// parts to keys.
- string_path(const String &value, char_type separator = char_type('.'),
+ string_path(const String &value, char_type separator_ = char_type('.'),
Translator tr = Translator());
/// Create a path by parsing the given string.
/// @param value A zero-terminated array of values. Only use if zero-
@@ -106,7 +106,7 @@
/// @param tr The translator used by this path to convert the individual
/// parts to keys.
string_path(const char_type *value,
- char_type separator = char_type('.'),
+ char_type separator_ = char_type('.'),
Translator tr = Translator());
// Default copying doesn't do the right thing with the iterator
@@ -162,23 +162,23 @@
};
template <typename String, typename Translator> inline
- string_path<String, Translator>::string_path(char_type separator)
- : m_separator(separator), m_start(m_value.begin())
+ string_path<String, Translator>::string_path(char_type separator_)
+ : m_separator(separator_), m_start(m_value.begin())
{}
template <typename String, typename Translator> inline
string_path<String, Translator>::string_path(const String &value,
- char_type separator,
+ char_type separator_,
Translator tr)
- : m_value(value), m_separator(separator),
+ : m_value(value), m_separator(separator_),
m_tr(tr), m_start(m_value.begin())
{}
template <typename String, typename Translator> inline
string_path<String, Translator>::string_path(const char_type *value,
- char_type separator,
+ char_type separator_,
Translator tr)
- : m_value(value), m_separator(separator),
+ : m_value(value), m_separator(separator_),
m_tr(tr), m_start(m_value.begin())
{}
|
