From 81b1bf6c265f77dd38901f76cdb4c97b3e85fd79 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 20 Apr 2018 08:51:26 +1000 Subject: Backport: Feature [feature-requests:#1215]. Fix forwarding reference warnings. Backport of changeset 6711:8d202ec5a734. --- src/ContractionState.cxx | 3 ++- src/SparseVector.h | 4 ++-- src/SplitVector.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/ContractionState.cxx b/src/ContractionState.cxx index be3c3d6ad..5937be6fc 100644 --- a/src/ContractionState.cxx +++ b/src/ContractionState.cxx @@ -286,7 +286,8 @@ bool ContractionState::SetFoldDisplayText(Sci::Line lineDoc, const char *t EnsureData(); const char *foldText = foldDisplayTexts->ValueAt(lineDoc).get(); if (!foldText || !text || 0 != strcmp(text, foldText)) { - foldDisplayTexts->SetValueAt(lineDoc, UniqueStringCopy(text)); + UniqueString uns = UniqueStringCopy(text); + foldDisplayTexts->SetValueAt(lineDoc, std::move(uns)); Check(); return true; } else { diff --git a/src/SparseVector.h b/src/SparseVector.h index 1b59f3570..df42e4511 100644 --- a/src/SparseVector.h +++ b/src/SparseVector.h @@ -77,11 +77,11 @@ public: if (position == startPartition) { // Already a value at this position, so replace ClearValue(partition); - values->SetValueAt(partition, std::move(value)); + values->SetValueAt(partition, std::forward(value)); } else { // Insert a new element starts->InsertPartition(partition + 1, position); - values->Insert(partition + 1, std::move(value)); + values->Insert(partition + 1, std::forward(value)); } } } diff --git a/src/SplitVector.h b/src/SplitVector.h index 16dec6e98..3fb595eef 100644 --- a/src/SplitVector.h +++ b/src/SplitVector.h @@ -130,14 +130,14 @@ public: if (position < 0) { ; } else { - body[position] = std::move(v); + body[position] = std::forward(v); } } else { PLATFORM_ASSERT(position < lengthBody); if (position >= lengthBody) { ; } else { - body[gapLength + position] = std::move(v); + body[gapLength + position] = std::forward(v); } } } -- cgit v1.2.3