Skip to content

std::move in a few more places #7502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BMagnu merged 1 commit into from
Jun 5, 2026
+4 −4
Merged

std::move in a few more places #7502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/model/animation/modelanimation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,7 +1509,7 @@ namespace animation {
curve = Curves[curve_id];
}

driver = [remap_driver_source = std::move(remap_driver_source), curve](ModelAnimation &, ModelAnimation::instance_data &instance, polymodel_instance *pmi, float) {
driver = [remap_driver_source = std::move(remap_driver_source), curve = std::move(curve)](ModelAnimation &, ModelAnimation::instance_data &instance, polymodel_instance *pmi, float) {
float oldFrametime = instance.time;
instance.time = curve ? curve->GetValue(remap_driver_source(pmi)) : remap_driver_source(pmi);
CLAMP(instance.time, 0.0f, instance.duration);
Expand All @@ -1534,7 +1534,7 @@ namespace animation {
curve = Curves[curve_id];
}

propertyDrivers.emplace_back([driver_source = std::move(driver_source), curve, target](ModelAnimation &, ModelAnimation::instance_data &instance, polymodel_instance *pmi) {
propertyDrivers.emplace_back([driver_source = std::move(driver_source), curve = std::move(curve), target](ModelAnimation &, ModelAnimation::instance_data &instance, polymodel_instance *pmi) {
float& property = instance.*(target.target);
property = curve ? curve->GetValue(driver_source(pmi)) : driver_source(pmi);
if(target.clamp) {
Expand All @@ -1560,7 +1560,7 @@ namespace animation {
curve = Curves[curve_id];
}

startupDrivers.emplace_back([driver_source = std::move(driver_source), curve, target](ModelAnimation &, ModelAnimation::instance_data &instance, polymodel_instance *pmi) {
startupDrivers.emplace_back([driver_source = std::move(driver_source), curve = std::move(curve), target](ModelAnimation &, ModelAnimation::instance_data &instance, polymodel_instance *pmi) {
float& property = instance.*(target.target);
property = curve ? curve->GetValue(driver_source(pmi)) : driver_source(pmi);
if(target.clamp) {
Expand Down
2 changes: 1 addition & 1 deletion code/sound/speech_win.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ SCP_vector<std::pair<int, SCP_string>> speech_enumerate_voices()
SCP_string voiceName;
voiceName.resize(buffer_size);
WideCharToMultiByte(CP_UTF8, 0, id, (int)idlength, &voiceName[0], buffer_size, nullptr, nullptr);
voices.emplace_back(std::make_pair(voiceID++, voiceName));
voices.emplace_back(voiceID++, std::move(voiceName));
}
CoTaskMemFree(id);
}
Expand Down
Loading