Skip to content

Commit 018a9bc

Browse files
committed
Removed un-needed calls to std::move
These calls were throwing a pessimistic move error and stopping compilation.
1 parent 71433c6 commit 018a9bc

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,14 @@ matrix:
121121
packages: ['libstdc++-4.9-dev']
122122
env: CLANG_VERSION='5.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON RUN_CLANG_FORMAT=ON ENABLE_LTO=ON
123123

124+
- os: linux
125+
compiler: "gcc-9-release"
126+
addons: &gcc9
127+
apt:
128+
sources: ['ubuntu-toolchain-r-test']
129+
packages: ['g++-9', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libboost-all-dev']
130+
env: CCOMPILER='gcc-9' CXXCOMPILER='g++-9' BUILD_TYPE='Release' CXXFLAGS='-Wno-cast-function-type'
131+
124132
- os: linux
125133
compiler: "gcc-8-release"
126134
addons: &gcc8

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
- Changes from 5.21.0
33
- Build:
44
- ADDED: optionally build Node `lts` and `latest` bindings [#5347](https://github.com/Project-OSRM/osrm-backend/pull/5347)
5+
- FIXED: pessimistic calls to std::move [#5560](https://github.com/Project-OSRM/osrm-backend/pull/5561)
56
- Features:
67
- ADDED: new waypoints parameter to the `route` plugin, enabling silent waypoints [#5345](https://github.com/Project-OSRM/osrm-backend/pull/5345)
78
- ADDED: data timestamp information in the response (saved in new file `.osrm.timestamp`). [#5115](https://github.com/Project-OSRM/osrm-backend/issues/5115)

include/updater/csv_file_parser.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ template <typename Key, typename Value> struct CSVFilesParser
122122

123123
util::Log() << "Loaded " << filename << " with " << result.size() << "values";
124124

125-
return std::move(result);
125+
return result;
126126
}
127127
catch (const boost::exception &e)
128128
{

src/server/api/parameters_parser.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ boost::optional<ParameterT> parseParameters(std::string::iterator &iter,
4545
const auto ok =
4646
boost::spirit::qi::parse(iter, end, grammar(boost::phoenix::ref(parameters)));
4747

48-
// return move(a.b) is needed to move b out of a and then return the rvalue by implicit move
4948
if (ok && iter == end)
50-
return std::move(parameters);
49+
return parameters;
5150
}
5251
catch (const qi::expectation_failure<It> &failure)
5352
{

0 commit comments

Comments
 (0)