diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-02 11:41:59 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-02 12:15:50 +0200 |
| commit | 414ff5650a810be807fed61ded1b9d6a23aa720b (patch) | |
| tree | fcb141772a56148f6dfa2cb153cf554d015c461d /external/boost | |
| parent | c3986c90e329af98520bda1ad11ecf6d059d50e1 (diff) | |
Avoid Wsahdow warnings related to boost json parser
Problematic variable: separator -> separator_
Change-Id: Ia4e1b1543f61b03e029e1bc4151ec58334e8df57
Diffstat (limited to 'external/boost')
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 1 | ||||
| -rw-r--r-- | external/boost/boost.jsonparser.warnings.patch.0 | 58 |
2 files changed, 59 insertions, 0 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index d73ee501b182..b3ffa7e24318 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -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)) diff --git a/external/boost/boost.jsonparser.warnings.patch.0 b/external/boost/boost.jsonparser.warnings.patch.0 new file mode 100644 index 000000000000..4a71b3b834bc --- /dev/null +++ b/external/boost/boost.jsonparser.warnings.patch.0 @@ -0,0 +1,58 @@ +--- 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()) + {} + |