Skip to content

Commit 78bacd7

Browse files
committed
test: qualified calls to std::move
1 parent 86bf4a6 commit 78bacd7

File tree

10 files changed

+14
-14
lines changed

10 files changed

+14
-14
lines changed

test/fixtures/parser.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct test_group {
6666

6767
test_group(const char *name_, check_func check_, test_case *tests_, size_t ntests_) noexcept
6868
: name{name_}
69-
, check{move(check_)}
69+
, check{std::move(check_)}
7070
, tests{tests_}
7171
, ntests{ntests_} {}
7272
};

test/lib/Cluster.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
Cluster::Cluster(Server serv, size_t cnt)
1111
: count{cnt}
12-
, proto{move(serv)}
12+
, proto{std::move(serv)}
1313
{
1414
if (!count) {
1515
count = 1;

test/lib/Cluster.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Cluster {
2828

2929
Cluster(Cluster &&c) noexcept
3030
: proto{} {
31-
*this = move(c);
31+
*this = std::move(c);
3232
};
3333
Cluster &operator=(Cluster &&c) noexcept {
3434
count = exchange(c.count, 0);

test/lib/Connection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Connection::Connection(Connection &&conn) noexcept {
104104
}
105105

106106
Connection &Connection::operator=(Connection &&conn) noexcept {
107-
Connection copy(move(conn));
107+
Connection copy(std::move(conn));
108108
copy.swap(*this);
109109
return *this;
110110
}

test/lib/MemcachedCluster.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,20 @@ MemcachedCluster::MemcachedCluster()
6060
}
6161

6262
MemcachedCluster::MemcachedCluster(Cluster &&cluster_, behaviors_t to_set_)
63-
: cluster{move(cluster_)}
64-
, to_set{move(to_set_)}
63+
: cluster{std::move(cluster_)}
64+
, to_set{std::move(to_set_)}
6565
{
6666
init();
6767
}
6868

6969
MemcachedCluster::MemcachedCluster(MemcachedCluster &&mc) noexcept
7070
: cluster{Server{}}
7171
{
72-
*this = move(mc);
72+
*this = std::move(mc);
7373
}
7474

7575
MemcachedCluster &MemcachedCluster::operator=(MemcachedCluster &&mc) noexcept {
76-
cluster = move(mc.cluster);
76+
cluster = std::move(mc.cluster);
7777
memcached_clone(&memc, &mc.memc);
7878
returns = &memc;
7979
return *this;

test/lib/Retry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Retry::Retry(predicate pred_, unsigned int max_, chrono::milliseconds sleep_for_)
44
: max{max_}
55
, sleep_for{sleep_for_}
6-
, pred{move(pred_)}
6+
, pred{std::move(pred_)}
77
{}
88

99
bool Retry::operator()() {

test/lib/Server.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#endif
99

1010
Server::Server(string binary_, Server::argv_t args_)
11-
: binary{move(binary_)}
12-
, args{move(args_)}
11+
: binary{std::move(binary_)}
12+
, args{std::move(args_)}
1313
{}
1414

1515
Server::~Server() {

test/lib/Server.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Server {
3737
Server &operator=(const Server &s);
3838

3939
Server(Server &&s) noexcept {
40-
*this = move(s);
40+
*this = std::move(s);
4141
};
4242
Server &operator=(Server &&s) noexcept {
4343
binary = exchange(s.binary, "false");

test/lib/Shell.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Shell::Shell(bool redirect_stderr)
4747
}
4848

4949
Shell::Shell(string prefix_, bool redirect_stderr)
50-
: prefix{move(prefix_)}
50+
: prefix{std::move(prefix_)}
5151
, redirect{redirect_stderr}
5252
{
5353
if (!system(nullptr)) {

test/tests/lib.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ TEST_CASE("lib/Connection") {
9090
REQUIRE(conn.isWritable());
9191
REQUIRE_FALSE(conn.getError());
9292
} else {
93-
again.emplace_back(move(conn));
93+
again.emplace_back(std::move(conn));
9494
}
9595
}
9696
conns.swap(again);

0 commit comments

Comments
 (0)