view OrthancFramework/Resources/Patches/boost-1.84.0-emscripten.patch @ 5570:cc4b7b4d5deb

fix
author Alain Mazy <am@orthanc.team>
date Thu, 25 Apr 2024 17:16:51 +0200
parents 7c5d30a3d5d2
children
line wrap: on
line source

diff -urEb boost_1_84_0.orig/libs/locale/src/boost/locale/shared/date_time.cpp boost_1_84_0/libs/locale/src/boost/locale/shared/date_time.cpp
--- boost_1_84_0.orig/libs/locale/src/boost/locale/shared/date_time.cpp	2024-01-24 16:33:34.349801130 +0100
+++ boost_1_84_0/libs/locale/src/boost/locale/shared/date_time.cpp	2024-01-24 16:35:29.516750122 +0100
@@ -12,8 +12,10 @@
 #include <boost/locale/date_time.hpp>
 #include <boost/locale/formatting.hpp>
 #include <boost/core/exchange.hpp>
-#include <boost/thread/locks.hpp>
-#include <boost/thread/mutex.hpp>
+#if !defined(__EMSCRIPTEN__)
+#  include <boost/thread/locks.hpp>
+#  include <boost/thread/mutex.hpp>
+#endif
 #include <cmath>
 
 namespace boost { namespace locale {
@@ -400,6 +402,7 @@
         return impl_->get_option(abstract_calendar::is_dst) != 0;
     }
 
+#if !defined(__EMSCRIPTEN__)
     namespace time_zone {
         boost::mutex& tz_mutex()
         {
@@ -422,6 +425,7 @@
             return boost::exchange(tz_id(), new_id);
         }
     } // namespace time_zone
+#endif
 
 }} // namespace boost::locale
 
diff -urEb boost_1_84_0.orig/libs/locale/src/boost/locale/shared/generator.cpp boost_1_84_0/libs/locale/src/boost/locale/shared/generator.cpp
--- boost_1_84_0.orig/libs/locale/src/boost/locale/shared/generator.cpp	2024-01-24 16:33:34.349801130 +0100
+++ boost_1_84_0/libs/locale/src/boost/locale/shared/generator.cpp	2024-01-24 16:36:33.212167880 +0100
@@ -7,8 +7,10 @@
 #include <boost/locale/encoding.hpp>
 #include <boost/locale/generator.hpp>
 #include <boost/locale/localization_backend.hpp>
-#include <boost/thread/locks.hpp>
-#include <boost/thread/mutex.hpp>
+#if !defined(__EMSCRIPTEN__)
+#  include <boost/thread/locks.hpp>
+#  include <boost/thread/mutex.hpp>
+#endif
 #include <algorithm>
 #include <map>
 #include <vector>
@@ -21,7 +23,9 @@
         {}
 
         mutable std::map<std::string, std::locale> cached;
+#if !defined(__EMSCRIPTEN__)
         mutable boost::mutex cached_lock;
+#endif
 
         category_t cats;
         char_facet_t chars;
@@ -101,7 +105,9 @@
     std::locale generator::generate(const std::locale& base, const std::string& id) const
     {
         if(d->caching_enabled) {
+#if !defined(__EMSCRIPTEN__)
             boost::unique_lock<boost::mutex> guard(d->cached_lock);
+#endif
             const auto p = d->cached.find(id);
             if(p != d->cached.end())
                 return p->second;
@@ -126,7 +132,9 @@
                 result = backend->install(result, facet, char_facet_t::nochar);
         }
         if(d->caching_enabled) {
+#if !defined(__EMSCRIPTEN__)
             boost::unique_lock<boost::mutex> guard(d->cached_lock);
+#endif
             const auto p = d->cached.find(id);
             if(p == d->cached.end())
                 d->cached[id] = result;
diff -urEb boost_1_84_0.orig/libs/locale/src/boost/locale/shared/localization_backend.cpp boost_1_84_0/libs/locale/src/boost/locale/shared/localization_backend.cpp
--- boost_1_84_0.orig/libs/locale/src/boost/locale/shared/localization_backend.cpp	2024-01-24 16:33:34.349801130 +0100
+++ boost_1_84_0/libs/locale/src/boost/locale/shared/localization_backend.cpp	2024-01-24 16:40:12.134162584 +0100
@@ -5,8 +5,10 @@
 // https://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/locale/localization_backend.hpp>
-#include <boost/thread/locks.hpp>
-#include <boost/thread/mutex.hpp>
+#if !defined(__EMSCRIPTEN__)
+#  include <boost/thread/locks.hpp>
+#  include <boost/thread/mutex.hpp>
+#endif
 #include <functional>
 #include <memory>
 #include <vector>
@@ -211,11 +213,13 @@
             return mgr;
         }
 
+#if !defined(__EMSCRIPTEN__)
         boost::mutex& localization_backend_manager_mutex()
         {
             static boost::mutex the_mutex;
             return the_mutex;
         }
+#endif
         localization_backend_manager& localization_backend_manager_global()
         {
             static localization_backend_manager the_manager = make_default_backend_mgr();
@@ -225,12 +229,16 @@
 
     localization_backend_manager localization_backend_manager::global()
     {
+#if !defined(__EMSCRIPTEN__)
         boost::unique_lock<boost::mutex> lock(localization_backend_manager_mutex());
+#endif
         return localization_backend_manager_global();
     }
     localization_backend_manager localization_backend_manager::global(const localization_backend_manager& in)
     {
+#if !defined(__EMSCRIPTEN__)
         boost::unique_lock<boost::mutex> lock(localization_backend_manager_mutex());
+#endif
         return exchange(localization_backend_manager_global(), in);
     }