diff --git a/cmake/rigel.cmake b/cmake/rigel.cmake index e863b48f6..cf9f93691 100644 --- 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 index e3f839cc2..e4d315a06 100644 --- 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 index d3b229f36..7d1be7f81 100644 --- a/src/assets/duke_script_loader.cpp +++ b/src/assets/duke_script_loader.cpp @@ -299,7 +299,7 @@ vector parseTextCommandWithBigText( const auto colorIndex = static_cast(*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 index 544bd1366..ebbcc046d 100644 --- 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 index 4fe575e14..cc5d0a26c 100644 --- 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 index fb0e477b7..ec43eb5e7 100644 --- 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(WATER_ANIM_TEX_WIDTH), static_cast(WATER_ANIM_TEX_HEIGHT)}; }