Fix Mac OS build

lethal-guitar · May 25, 2024 · 5da2210 · 5da2210
1 parent 90031bd
commit 5da2210
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/cmake/rigel.cmake b/cmake/rigel.cmake
@@ -34,6 +34,7 @@ function(rigel_enable_warnings target)
             -Wno-unknown-warning-option
             -Wno-c++98-compat
             -Wno-c++98-compat-pedantic
+            -Wno-unqualified-std-cast-call
             -Wno-covered-switch-default
             -Wno-exit-time-destructors
             -Wno-missing-braces

diff --git a/src/assets/actor_image_package.cpp b/src/assets/actor_image_package.cpp
@@ -74,7 +74,7 @@ ActorImagePackage::ActorImagePackage(
     if (!frameHeaders.empty())
     {
       mHeadersById.emplace(
-        ActorID(index), ActorHeader{drawIndex, move(frameHeaders)});
+        ActorID(index), ActorHeader{drawIndex, std::move(frameHeaders)});
     }
   }
 }

diff --git a/src/assets/duke_script_loader.cpp b/src/assets/duke_script_loader.cpp
@@ -299,7 +299,7 @@ vector<Action> parseTextCommandWithBigText(
   const auto colorIndex = static_cast<uint8_t>(*bigTextMarkerIter) - 0xF0;
   string bigTextPart(next(bigTextMarkerIter), sourceText.end());
   textActions.emplace_back(
-    DrawBigText{x + positionOffset, y, colorIndex, move(bigTextPart)});
+    DrawBigText{x + positionOffset, y, colorIndex, std::move(bigTextPart)});
 
   return textActions;
 }
@@ -585,7 +585,7 @@ data::LevelHints loadHintMessages(const std::string& scriptSource)
       skipWhiteSpace(lineTextStream);
 
       getline(lineTextStream, message, '\r');
-      hints.emplace_back(episode - 1, level - 1, move(message));
+      hints.emplace_back(episode - 1, level - 1, std::move(message));
     }
   }
 

diff --git a/src/assets/resource_loader.cpp b/src/assets/resource_loader.cpp
@@ -274,7 +274,9 @@ data::Image ResourceLoader::loadAntiPiracyImage() const
     back_inserter(pixels),
     [&palette](const auto indexedPixel) { return palette[indexedPixel]; });
   return data::Image(
-    move(pixels), GameTraits::viewportWidthPx, GameTraits::viewportHeightPx);
+    std::move(pixels),
+    GameTraits::viewportWidthPx,
+    GameTraits::viewportHeightPx);
 }
 
 

diff --git a/src/data/tile_attributes.ipp b/src/data/tile_attributes.ipp
@@ -148,7 +148,7 @@ inline TileAttributeDict::TileAttributeDict(const AttributeArray& bitpacks)
 
 
 inline TileAttributeDict::TileAttributeDict(AttributeArray&& bitpacks)
-  : mAttributeBitPacks(move(bitpacks))
+  : mAttributeBitPacks(std::move(bitpacks))
 {
 }
 

diff --git a/src/engine/graphical_effects.cpp b/src/engine/graphical_effects.cpp
@@ -260,7 +260,7 @@ data::Image createWaterSurfaceAnimImage()
   applyPattern(patternWaveLeft, pixelsPerAnimStep * 3);
 
   return data::Image{
-    move(pixels),
+    std::move(pixels),
     static_cast<size_t>(WATER_ANIM_TEX_WIDTH),
     static_cast<size_t>(WATER_ANIM_TEX_HEIGHT)};
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     inline TileAttributeDict::TileAttributeDict(AttributeArray&& bitpacks)
-      : mAttributeBitPacks(move(bitpacks))
+      : mAttributeBitPacks(std::move(bitpacks))
     {
     }
@@ Expand Down @@