Fix build error on old compiler without C++23 support.

zufuliu · May 12, 2024 · 5d70c61 · 5d70c61
1 parent 0d9953e
commit 5d70c61
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/scintilla/include/boost/regex/v5/iterator_category.hpp b/scintilla/include/boost/regex/v5/iterator_category.hpp
@@ -75,8 +75,6 @@ struct is_random_access_iterator
    static constexpr bool value = answer::value;
 };
 
-template <class I>
-constexpr bool is_random_access_iterator<I>::value;
 
 }
 

diff --git a/scintilla/include/boost/regex/v5/match_results.hpp b/scintilla/include/boost/regex/v5/match_results.hpp
@@ -503,7 +503,7 @@ class match_results
 
    void  set_named_subs(std::shared_ptr<named_sub_type> subs)
    {
-      m_named_subs = subs;
+      m_named_subs = std::move(subs);
    }
 
 private:

diff --git a/scintilla/include/boost/regex/v5/w32_regex_traits.hpp b/scintilla/include/boost/regex/v5/w32_regex_traits.hpp
@@ -586,7 +586,7 @@ w32_regex_traits_implementation<charT>::w32_regex_traits_implementation(::boost:
          w32_regex_traits_implementation<charT>::mask_word,
          w32_regex_traits_implementation<charT>::mask_unicode,
       };
-      constexpr string_type null_string;
+      const string_type null_string;
       for(unsigned int j = 0; j <= 13; ++j)
       {
          string_type s(::boost::BOOST_REGEX_DETAIL_NS::w32_cat_get(cat, this->m_locale, j+300, null_string));