Kaydet (Commit) 414ff565 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

Avoid Wsahdow warnings related to boost json parser

Problematic variable: separator -> separator_

Change-Id: Ia4e1b1543f61b03e029e1bc4151ec58334e8df57
üst c3986c90
......@@ -49,6 +49,7 @@ boost_patches += boost.wuninitialized.patch
boost_patches += boost.wdeprecated-auto_ptr.patch.0
#https://svn.boost.org/trac/boost/ticket/9397
boost_patches += boost.9397.warnings.patch.0
boost_patches += boost.jsonparser.warnings.patch.0
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
......
--- boost/property_tree/string_path.hpp
+++ boost/property_tree/string_path.hpp
@@ -88,14 +88,14 @@ namespace boost { namespace property_tree
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 @@ namespace boost { namespace property_tree
/// @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 @@ namespace boost { namespace property_tree
};
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())
{}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment