From 85b5c6ffbd8697ff3182b97a30e048dc4c24f949 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Mon, 12 Feb 2018 11:09:00 -0600 Subject: [PATCH] Fix pessimizing-move compiler warning. Returning via move() should never be needed and may result in a compiler warning: "moving a local object in a return statement prevents copy elision". --- CHANGES | 4 ++++ VERSION | 2 +- src/ID.cc | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 7b4ea99681..d28e76872a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.5-448 | 2018-02-12 11:09:00 -0600 + + * Fix pessimizing-move compiler warning. (Corelight) + 2.5-447 | 2018-02-12 11:00:44 -0600 * Add limit to number of auth flavors parsed out of MNT replies (Corelight) diff --git a/VERSION b/VERSION index 3be07dbdfb..388b4fad5e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-447 +2.5-448 diff --git a/src/ID.cc b/src/ID.cc index eb9644ece0..4216422225 100644 --- a/src/ID.cc +++ b/src/ID.cc @@ -789,5 +789,5 @@ vector ID::GetOptionHandlers() const vector v; for ( auto& element : option_handlers ) v.push_back(element.second); - return std::move(v); + return v; }