[ci] BSD and MinGW fixes

ossia · Jul 8, 2024 · 8a789be · 8a789be
1 parent ec915f2
commit 8a789be
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/ci/freebsd.build.sh b/ci/freebsd.build.sh
@@ -11,6 +11,7 @@ cmake $SCORE_DIR \
   -DCMAKE_INSTALL_PREFIX=install \
   -DSCORE_DYNAMIC_PLUGINS=1 \
   -DSCORE_DISABLED_PLUGINS=score-plugin-vst3 \
+  -DCMAKE_CXX_FLAGS="-fexperimental-library" \
   -DSCORE_PCH=1
 
 cmake --build .

diff --git a/src/plugins/score-plugin-scenario/Scenario/Document/Interval/TimeSignatureMap.cpp b/src/plugins/score-plugin-scenario/Scenario/Document/Interval/TimeSignatureMap.cpp
@@ -10,12 +10,15 @@
 namespace Scenario
 {
 
-using TimeSignatureMapVector
+using TimeSignatureMapDtlVector
     = std::vector<boost::container::dtl::pair<TimeVal, ossia::time_signature>>;
 using TimeSignatureMapStdVector = std::vector<std::pair<TimeVal, ossia::time_signature>>;
-struct TimeSignatureMap::impl
-    : boost::container::flat_map<
-          TimeVal, ossia::time_signature, std::less<TimeVal>, TimeSignatureMapStdVector>
+using TimeSignatureFlatMap = boost::container::flat_map<
+    TimeVal, ossia::time_signature, std::less<TimeVal>, TimeSignatureMapStdVector>;
+using TimeSignatureFlatMapImpl
+    = std::remove_cvref_t<decltype(TimeSignatureFlatMap{}.tree().get_sequence_cref())>;
+
+struct TimeSignatureMap::impl : TimeSignatureFlatMap
 {
   using flat_map::flat_map;
 };
@@ -146,7 +149,8 @@ void TSerializer<DataStream, Scenario::TimeSignatureMap>::readFrom(
 {
   if(!path.map)
     path.map = new Scenario::TimeSignatureMap::impl;
-  TSerializer<DataStream, Scenario::TimeSignatureMapVector>::readFrom(
+
+  TSerializer<DataStream, Scenario::TimeSignatureFlatMapImpl>::readFrom(
       s, path.map->tree().get_sequence_cref());
 }
 
@@ -155,7 +159,7 @@ void TSerializer<DataStream, Scenario::TimeSignatureMap>::writeTo(
 {
   if(!path.map)
     path.map = new Scenario::TimeSignatureMap::impl;
-  TSerializer<DataStream, Scenario::TimeSignatureMapVector>::writeTo(
+  TSerializer<DataStream, Scenario::TimeSignatureFlatMapImpl>::writeTo(
       s, path.map->tree().get_sequence_ref());
 }
 
@@ -164,7 +168,7 @@ void TSerializer<JSONObject, Scenario::TimeSignatureMap>::readFrom(
 {
   if(!path.map)
     path.map = new Scenario::TimeSignatureMap::impl;
-  TSerializer<JSONObject, Scenario::TimeSignatureMapVector>::readFrom(
+  TSerializer<JSONObject, Scenario::TimeSignatureFlatMapImpl>::readFrom(
       s, path.map->tree().get_sequence_cref());
 }
 
@@ -173,6 +177,6 @@ void TSerializer<JSONObject, Scenario::TimeSignatureMap>::writeTo(
 {
   if(!path.map)
     path.map = new Scenario::TimeSignatureMap::impl;
-  TSerializer<JSONObject, Scenario::TimeSignatureMapVector>::writeTo(
+  TSerializer<JSONObject, Scenario::TimeSignatureFlatMapImpl>::writeTo(
       s, path.map->tree().get_sequence_ref());
 }