Update contrib/restricted/boost/property_tree to 1.85.0

d063d388d6659a94f4c78cf5de3275260939bb62

7 files changed, 17 insertions, 58 deletions

diff --git a/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/exception_implementation.hpp b/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/exception_implementation.hpp
index 1d6c48fe1e..77cf9bc4a8 100644
--- a/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/exception_implementation.hpp
+++ b/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/exception_implementation.hpp
@@ -11,6 +11,10 @@
 #ifndef BOOST_PROPERTY_TREE_DETAIL_EXCEPTIONS_IMPLEMENTATION_HPP_INCLUDED
 #define BOOST_PROPERTY_TREE_DETAIL_EXCEPTIONS_IMPLEMENTATION_HPP_INCLUDED
 
+#include <boost/property_tree/exceptions.hpp>
+
+#include <string>
+
 namespace boost { namespace property_tree
 {
 
@@ -35,10 +39,6 @@ namespace boost { namespace property_tree
     {
     }
 
-    inline ptree_error::~ptree_error()
-    {
-    }
-
     ///////////////////////////////////////////////////////////////////////////
     // ptree_bad_data
 
@@ -48,10 +48,6 @@ namespace boost { namespace property_tree
     {
     }
 
-    inline ptree_bad_data::~ptree_bad_data()
-    {
-    }
-
     template<class D> inline
     D ptree_bad_data::data() const
     {
@@ -68,10 +64,6 @@ namespace boost { namespace property_tree
 
     }
 
-    inline ptree_bad_path::~ptree_bad_path()
-    {
-    }
-
     template<class P> inline
     P ptree_bad_path::path() const
     {
diff --git a/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/file_parser_error.hpp b/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/file_parser_error.hpp
index 2b02e43a0e..4ed45b4976 100644
--- a/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/file_parser_error.hpp
+++ b/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/file_parser_error.hpp
@@ -12,6 +12,7 @@
 
 #include <boost/property_tree/ptree.hpp>
 #include <string>
+#include <sstream>
 
 namespace boost { namespace property_tree
 {
@@ -23,7 +24,7 @@ namespace boost { namespace property_tree
     public:
 
         ///////////////////////////////////////////////////////////////////////
-        // Construction & destruction
+        // Construction
 
         // Construct error
         file_parser_error(const std::string &msg,
@@ -34,12 +35,6 @@ namespace boost { namespace property_tree
         {
         }
 
-        ~file_parser_error() BOOST_OVERRIDE
-            // gcc 3.4.2 complains about lack of throw specifier on compiler
-            // generated dtor
-        {
-        }
-
         ///////////////////////////////////////////////////////////////////////
         // Data access
 
diff --git a/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/ptree_implementation.hpp b/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/ptree_implementation.hpp
index 1af65ca84e..1f2d8444a0 100644
--- a/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/ptree_implementation.hpp
+++ b/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/ptree_implementation.hpp
@@ -11,6 +11,7 @@
 #ifndef BOOST_PROPERTY_TREE_DETAIL_PTREE_IMPLEMENTATION_HPP_INCLUDED
 #define BOOST_PROPERTY_TREE_DETAIL_PTREE_IMPLEMENTATION_HPP_INCLUDED
 
+#include <boost/property_tree/ptree.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/iterator/reverse_iterator.hpp>
 #include <boost/assert.hpp>
diff --git a/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/rapidxml.hpp b/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/rapidxml.hpp
index 2fe16c1a03..050e1c35ca 100644
--- a/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/rapidxml.hpp
+++ b/contrib/restricted/boost/property_tree/include/boost/property_tree/detail/rapidxml.hpp
@@ -59,7 +59,7 @@ namespace boost { namespace property_tree { namespace detail {namespace rapidxml
 
         //! Gets human readable description of error.
         //! \return Pointer to null terminated description of the error.
-        const char *what() const noexcept BOOST_OVERRIDE
+        const char *what() const noexcept override
         {
             return m_what;
         }
diff --git a/contrib/restricted/boost/property_tree/include/boost/property_tree/exceptions.hpp b/contrib/restricted/boost/property_tree/include/boost/property_tree/exceptions.hpp
index de7b5774ea..853f0a12a3 100644
--- a/contrib/restricted/boost/property_tree/include/boost/property_tree/exceptions.hpp
+++ b/contrib/restricted/boost/property_tree/include/boost/property_tree/exceptions.hpp
@@ -30,8 +30,6 @@ namespace boost { namespace property_tree
         /// Instantiate a ptree_error instance with the given message.
         /// @param what The message to associate with this error.
         ptree_error(const std::string &what);
-
-        ~ptree_error() BOOST_OVERRIDE;
     };
 
 
@@ -48,8 +46,6 @@ namespace boost { namespace property_tree
         template<class T> ptree_bad_data(const std::string &what,
                                          const T &data);
 
-        ~ptree_bad_data() BOOST_OVERRIDE;
-
         /// Retrieve the data associated with this error. This is the source
         /// value that failed to be translated. You need to explicitly
         /// specify its type.
@@ -70,8 +66,6 @@ namespace boost { namespace property_tree
         template<class T> ptree_bad_path(const std::string &what,
                                          const T &path);
 
-        ~ptree_bad_path() BOOST_OVERRIDE;
-
         /// Retrieve the invalid path. You need to explicitly specify the
         /// type of path.
         template<class T> T path() const;
diff --git a/contrib/restricted/boost/property_tree/include/boost/property_tree/string_path.hpp b/contrib/restricted/boost/property_tree/include/boost/property_tree/string_path.hpp
index 6932d59b09..de2abc0a49 100644
--- a/contrib/restricted/boost/property_tree/include/boost/property_tree/string_path.hpp
+++ b/contrib/restricted/boost/property_tree/include/boost/property_tree/string_path.hpp
@@ -129,6 +129,13 @@ namespace boost { namespace property_tree
             return detail::dump_sequence(m_value);
         }
 
+        /// Concatenates two path components
+        friend string_path operator /(string_path p1, const string_path &p2)
+        {
+            p1 /= p2;
+            return p1;
+        }
+
         /// Append a second path to this one.
         /// @pre o's separator is the same as this one's, or o has no separators
         string_path& operator /=(const string_path &o) {
@@ -243,36 +250,6 @@ namespace boost { namespace property_tree
         typedef std::basic_string<Ch, Traits, Alloc> _string;
         typedef string_path< _string, id_translator<_string> > type;
     };
-
-    template <typename String, typename Translator> inline
-    string_path<String, Translator> operator /(
-                                  string_path<String, Translator> p1,
-                                  const string_path<String, Translator> &p2)
-    {
-        p1 /= p2;
-        return p1;
-    }
-
-    // These shouldn't be necessary, but GCC won't find the one above.
-    template <typename String, typename Translator> inline
-    string_path<String, Translator> operator /(
-                                  string_path<String, Translator> p1,
-                                  const typename String::value_type *p2)
-    {
-        p1 /= p2;
-        return p1;
-    }
-
-    template <typename String, typename Translator> inline
-    string_path<String, Translator> operator /(
-                                  const typename String::value_type *p1,
-                                  const string_path<String, Translator> &p2)
-    {
-        string_path<String, Translator> t(p1);
-        t /= p2;
-        return t;
-    }
-
 }}
 
 #endif
diff --git a/contrib/restricted/boost/property_tree/ya.make b/contrib/restricted/boost/property_tree/ya.make
index e4bb1a6a78..f508c25481 100644
--- a/contrib/restricted/boost/property_tree/ya.make
+++ b/contrib/restricted/boost/property_tree/ya.make
@@ -6,9 +6,9 @@ LICENSE(BSL-1.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(1.84.0)
+VERSION(1.85.0)
 
-ORIGINAL_SOURCE(https://github.com/boostorg/property_tree/archive/boost-1.84.0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/boostorg/property_tree/archive/boost-1.85.0.tar.gz)
 
 PEERDIR(
     contrib/restricted/boost/any