import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / algorithm / cxx14 / mismatch.hpp

diff --git a/ceph/src/boost/boost/algorithm/cxx14/mismatch.hpp b/ceph/src/boost/boost/algorithm/cxx14/mismatch.hpp
index c3de41822259d9c416f1e3f55af6e562397de2aa..a1fafe80dfac1b1417f97892581f03719903dc80 100644 (file)
--- a/ceph/src/boost/boost/algorithm/cxx14/mismatch.hpp
+++ b/ceph/src/boost/boost/algorithm/cxx14/mismatch.hpp
@@ -2,7 +2,7 @@
    Copyright (c) Marshall Clow 2008-2012.
 
    Distributed under the Boost Software License, Version 1.0. (See accompanying
-   file LICENSE10.txt or copy at http://www.boost.org/LICENSE10.txt)
+   file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 */
 
 /// \file  mismatch.hpp
@@ -14,6 +14,8 @@
 
 #include <utility>      // for std::pair
 
+#include <boost/config.hpp>
+
 namespace boost { namespace algorithm {
 
 /// \fn mismatch ( InputIterator1 first1, InputIterator1 last1, 
@@ -27,7 +29,7 @@ namespace boost { namespace algorithm {
 /// \param last2     One past the end of the second range.
 /// \param pred      A predicate for comparing the elements of the ranges
 template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-std::pair<InputIterator1, InputIterator2> mismatch (
+BOOST_CXX14_CONSTEXPR std::pair<InputIterator1, InputIterator2> mismatch (
                     InputIterator1 first1, InputIterator1 last1,
                     InputIterator2 first2, InputIterator2 last2,
                     BinaryPredicate pred )
@@ -47,7 +49,7 @@ std::pair<InputIterator1, InputIterator2> mismatch (
 /// \param first2    The start of the second range.
 /// \param last2     One past the end of the second range.
 template <class InputIterator1, class InputIterator2>
-std::pair<InputIterator1, InputIterator2> mismatch (
+BOOST_CXX14_CONSTEXPR std::pair<InputIterator1, InputIterator2> mismatch (
                     InputIterator1 first1, InputIterator1 last1,
                     InputIterator2 first2, InputIterator2 last2 )
 {