projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
testing: freebsd [travis skip]
[m6w6/libmemcached]
/
test
/
lib
/
Server.hpp
diff --git
a/test/lib/Server.hpp
b/test/lib/Server.hpp
index 5e263267b1cdd252d61180d9d8808fe0c3061701..9b1d4a7324c2334800cc075597e237b455e1f494 100644
(file)
--- a/
test/lib/Server.hpp
+++ b/
test/lib/Server.hpp
@@
-36,8
+36,10
@@
public:
Server(const Server &s);
Server &operator=(const Server &s);
Server(const Server &s);
Server &operator=(const Server &s);
- Server(Server &&s) { *this = move(s); };
- Server &operator=(Server &&s) {
+ Server(Server &&s) noexcept {
+ *this = move(s);
+ };
+ Server &operator=(Server &&s) noexcept {
binary = exchange(s.binary, "false");
args = exchange(s.args, {});
pid = exchange(s.pid, 0);
binary = exchange(s.binary, "false");
args = exchange(s.args, {});
pid = exchange(s.pid, 0);
@@
-89,7
+91,7
@@
private:
optional<string> handleArg(vector<char *> &arr, const string &arg, const arg_func_t &next_arg);
};
optional<string> handleArg(vector<char *> &arr, const string &arg, const arg_func_t &next_arg);
};
-inline ostream &operator<<(ostream &out, const socket_or_port_t sop) {
+inline ostream &operator<<(ostream &out, const socket_or_port_t
&
sop) {
if (holds_alternative<string>(sop)) {
out << get<string>(sop);
} else {
if (holds_alternative<string>(sop)) {
out << get<string>(sop);
} else {