diff --git a/include/dindexer-machinery/set_listing.hpp b/include/dindexer-machinery/set_listing.hpp index 80991fc..f5a260b 100644 --- a/include/dindexer-machinery/set_listing.hpp +++ b/include/dindexer-machinery/set_listing.hpp @@ -164,7 +164,7 @@ namespace mchlib { auto end = parList.end(); for (auto it = parList.begin(); it != end; ++it) { if (not it->is_directory) - return std::move(it); + return it; } return parList.end(); } @@ -174,7 +174,7 @@ namespace mchlib { auto end = parList.end(); for (auto it = parList.begin(); it != end; ++it) { if (not it->is_directory) - return std::move(it); + return it; } return parList.end(); } diff --git a/include/dindexer-machinery/set_listing_helpers.hpp b/include/dindexer-machinery/set_listing_helpers.hpp index 1250c7c..95f60c3 100644 --- a/include/dindexer-machinery/set_listing_helpers.hpp +++ b/include/dindexer-machinery/set_listing_helpers.hpp @@ -109,7 +109,7 @@ namespace mchlib { std::vector::type> retval; implem::flattened_listing(parContent, retval); - return std::move(retval); + return retval; } } //namespace mchlib diff --git a/src/common/commandline.cpp b/src/common/commandline.cpp index 609fde6..4880a23 100644 --- a/src/common/commandline.cpp +++ b/src/common/commandline.cpp @@ -45,7 +45,7 @@ namespace dinlib { ("version", "Prints the program's version and quits") //("dump-raw,D", po::value(), "Saves the retrieved html to the named file; use - for stdout") ; - return std::move(desc); + return desc; } void print_commandline_help (std::ostream& parStream, const std::string& parSummary, const boost::program_options::options_description& parOpts) { diff --git a/src/delete/postgre_delete.cpp b/src/delete/postgre_delete.cpp index d2f4a00..6fe550c 100644 --- a/src/delete/postgre_delete.cpp +++ b/src/delete/postgre_delete.cpp @@ -34,7 +34,7 @@ namespace din { IDDescMap retmap; if (parIDs.empty()) { - return std::move(retmap); + return retmap; } std::ostringstream oss; @@ -46,7 +46,7 @@ namespace din { for (const auto& record : resultset) { retmap[lexical_cast(record["id"])] = record["desc"]; } - return std::move(retmap); + return retmap; } } //unnamed namespace diff --git a/src/locate/postgre_locate.cpp b/src/locate/postgre_locate.cpp index 2df6632..6ee2e68 100644 --- a/src/locate/postgre_locate.cpp +++ b/src/locate/postgre_locate.cpp @@ -35,7 +35,7 @@ namespace din { if (parOpen) { conn.connect(); } - return std::move(conn); + return conn; } std::vector sets_result_to_vec (pq::ResultSet&& parResult) { @@ -52,7 +52,7 @@ namespace din { }); } - return std::move(retval); + return retval; } std::vector file_result_to_vec (pq::ResultSet&& parResult) { @@ -68,7 +68,7 @@ namespace din { }); } - return std::move(retval); + return retval; } } //unnamed namespace diff --git a/src/machinery/discinfo.cpp b/src/machinery/discinfo.cpp index 71f83db..3993c30 100644 --- a/src/machinery/discinfo.cpp +++ b/src/machinery/discinfo.cpp @@ -136,7 +136,7 @@ namespace mchlib { retmap[std::move(mount)] = std::move(dev); } - return std::move(retmap); + return retmap; } #if defined(WITH_MEDIA_AUTODETECT) diff --git a/src/machinery/guess_content_type.cpp b/src/machinery/guess_content_type.cpp index ae7453b..a609c92 100644 --- a/src/machinery/guess_content_type.cpp +++ b/src/machinery/guess_content_type.cpp @@ -64,7 +64,7 @@ namespace mchlib { for (; it_begin != it_end; ++it_begin) { retval.push_back(&*it_begin); } - return std::move(retval); + return retval; } std::vector check_missing_content (const std::vector& parContent, const std::vector& parCheck) { @@ -84,7 +84,7 @@ namespace mchlib { retval.push_back(z); } } - return std::move(retval); + return retval; } bool identify_video_dvd (MediaTypes parMediaType, const ConstSetListingView& parContent, const std::vector& parFlatContent ) { diff --git a/src/machinery/pathname.cpp b/src/machinery/pathname.cpp index b5e7f00..6ee899e 100644 --- a/src/machinery/pathname.cpp +++ b/src/machinery/pathname.cpp @@ -107,7 +107,7 @@ namespace mchlib { slash = "/"; } assert(reserve == out.size()); - return std::move(out); + return out; } } //unnamed namespace @@ -185,7 +185,7 @@ namespace mchlib { for (std::size_t z = 0; z < remaining_atoms; ++z) { retval.join(parOtherPath[z + common_atoms], parOtherPath.get_stringref_source(z + common_atoms)); } - return std::move(retval); + return retval; } const std::string* PathName::get_stringref_source (std::size_t parIndex) const { diff --git a/src/navigate/dbsource.cpp b/src/navigate/dbsource.cpp index 1f896a7..a4b488d 100644 --- a/src/navigate/dbsource.cpp +++ b/src/navigate/dbsource.cpp @@ -110,7 +110,7 @@ namespace din { for (const auto& row : res) { retval.push_back(lexical_cast(row[0])); } - return std::move(retval); + return retval; } void DBSource::query_no_conditions (const ColumnList& parCols, boost::string_ref parTable, const std::vector& parIDs, std::function parCallback) { diff --git a/src/navigate/dbsource.hpp b/src/navigate/dbsource.hpp index 26ce30a..a68671b 100644 --- a/src/navigate/dbsource.hpp +++ b/src/navigate/dbsource.hpp @@ -105,13 +105,13 @@ namespace din { std::vector columns; columns.reserve(sizeof...(Details)); - const std::array details { Details... }; + const std::array details { {Details...} }; //AtFunc at_func = &SetDetailsMap::at; //std::generate(details.begin(), details.end(), columns.begin(), std::bind(at_func, &details_dic, std::placeholders::_1)); for (auto detail : details) { columns.push_back(parDic.at(detail)); } - return std::move(columns); + return columns; } } //namespace implem @@ -126,7 +126,7 @@ namespace din { FlatInsertIn2DList flat_list(&list, sizeof...(D)); FlatPushBackFunc pback_func = &FlatInsertIn2DList::push_back; this->query_no_conditions(columns, "sets", parIDs, std::bind(pback_func, &flat_list, std::placeholders::_1)); - return std::move(list); + return list; } template @@ -140,7 +140,7 @@ namespace din { FlatInsertIn2DList flat_list(&list, sizeof...(D)); FlatPushBackFunc pback_func = &FlatInsertIn2DList::push_back; this->query_files_in_dir(columns, parDir, parLevel, parSetID, std::bind(pback_func, &flat_list, std::placeholders::_1)); - return std::move(list); + return list; } } //namespace din diff --git a/src/navigate/listdircontent.cpp b/src/navigate/listdircontent.cpp index 4bfb050..0713be7 100644 --- a/src/navigate/listdircontent.cpp +++ b/src/navigate/listdircontent.cpp @@ -42,7 +42,7 @@ namespace din { boost::copy(row, infix_ostream_iterator(oss, "\t")); result.push_back(oss.str()); } - return std::move(result); + return result; } } //unnamed namespace diff --git a/src/pq/connection.cpp b/src/pq/connection.cpp index c37daf9..d7b9831 100644 --- a/src/pq/connection.cpp +++ b/src/pq/connection.cpp @@ -187,13 +187,13 @@ namespace pq { call_PQputf(retval.get(), parTypes, argp); va_end(argp); - return std::move(retval); + return retval; } auto Connection::make_empty_params() const -> PGParams { assert(is_connected()); auto ret = PGParams(PQparamCreate(m_localData->connection), &PQparamClear); assert(ret.get()); - return std::move(ret); + return ret; } } //namespace pq