Skip to content

Commit 437b42c

Browse files
yph025869yph025869
committed
fix lvalue to rvalue
1 parent 6207b1b commit 437b42c

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

‎include/cppredis/cpp_hash_client.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ namespace cpp_redis
8282
return "";
8383
}
8484

85-
return ((results[0] == g_nil) ? "" : results[0]);
85+
return ((results[0] == g_nil) ? "" : std::move(results[0]));
8686
}
8787

8888
virtual int hash_del(std::vector<std::string>&& fields)
@@ -170,7 +170,7 @@ namespace cpp_redis
170170

171171
const auto results = res->get_results();
172172

173-
return ((!results.empty()) ? results[0] : "");
173+
return ((!results.empty()) ? std::move(results[0]) : "");
174174
}
175175

176176

@@ -199,7 +199,7 @@ namespace cpp_redis
199199
return {} ;
200200
}
201201

202-
return res->get_results();
202+
return std::move(res->get_results());
203203
}
204204

205205
//返回所有的keys
@@ -214,7 +214,7 @@ namespace cpp_redis
214214
return {} ;
215215
}
216216

217-
return res->get_results();
217+
return std::move(res->get_results());
218218
}
219219

220220

@@ -231,7 +231,7 @@ namespace cpp_redis
231231
return {} ;
232232
}
233233

234-
return res->get_results();
234+
return std::move(res->get_results());
235235
}
236236

237237
//返回key中的域和值
@@ -247,7 +247,7 @@ namespace cpp_redis
247247
return {} ;
248248
}
249249

250-
return res->get_results();
250+
return std::move(res->get_results());
251251
}
252252

253253
};

‎include/cppredis/cpp_redis_list.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ namespace cpp_redis {
125125
}
126126

127127
//函数调用是右值
128-
return res->get_results();
128+
return std::move(res->get_results());
129129
}
130130

131131
//第一个开始弹,不管原始的插入方向
@@ -144,7 +144,7 @@ namespace cpp_redis {
144144

145145
const auto results = res->get_results();
146146

147-
return ((!results.empty()) ? results[0]:"");
147+
return ((!results.empty()) ? std::move(results[0]):"");
148148
}
149149

150150
//从最后面弹出元素，元素弹完了，redis直接删除
@@ -163,7 +163,7 @@ namespace cpp_redis {
163163

164164
const auto results = res->get_results();
165165

166-
return ((!results.empty()) ? results[0] : "");
166+
return ((!results.empty()) ? std::move(results[0]) : "");
167167
}
168168

169169
//弹出最后元素
@@ -182,7 +182,7 @@ namespace cpp_redis {
182182
}
183183

184184
const auto results = res->get_results();
185-
return ((!results.empty() && results.size() == 2) ? results[1] : "");
185+
return ((!results.empty() && results.size() == 2) ? std::move(results[1]) : "");
186186
}
187187

188188
//弹出最前元素
@@ -200,7 +200,7 @@ namespace cpp_redis {
200200
}
201201

202202
const auto results = res->get_results();
203-
return ((!results.empty() && results.size()==2) ? results[1] : "");
203+
return ((!results.empty() && results.size()==2) ? std::move(results[1]) : "");
204204
}
205205

206206
//列表只保留指定区间内的元素，不在指定区间之内的元素都将被删除。
@@ -234,7 +234,7 @@ namespace cpp_redis {
234234

235235
const auto results = res->get_results();
236236

237-
return ((!results.empty() && results[0]!= g_nil) ? results[0] : "");
237+
return ((!results.empty() && results[0]!= g_nil) ? std::move(results[0]) : "");
238238
}
239239

240240
//指定索引上设置元素值
@@ -293,7 +293,7 @@ namespace cpp_redis {
293293

294294
const auto results = res->get_results();
295295

296-
return ((!results.empty()) ? results[0] : "");
296+
return ((!results.empty()) ? std::move(results[0]) : "");
297297
}
298298

299299
//最后一个元素移动到另外一个list去
@@ -313,7 +313,7 @@ namespace cpp_redis {
313313

314314
const auto results = res->get_results();
315315

316-
return ((!results.empty()) ? results[0] : "");
316+
return ((!results.empty()) ? std::move(results[0]) : "");
317317
}
318318

319319
virtual int list_insert_before(std::string&& key, std::string&& dst_value, std::string&& insert_value)

‎include/cppredis/cpp_redis_string.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ namespace cpp_redis {
145145

146146
const auto results = res->get_results();
147147

148-
return ((results.empty() ||results[0] == g_nil) ? "": results[0]);
148+
return ((results.empty() ||results[0] == g_nil) ? "": std::move(results[0]));
149149
}
150150

151151
//若不存在,就创建key,然后再增加1
@@ -204,7 +204,7 @@ namespace cpp_redis {
204204

205205
const auto results = res->get_results();
206206

207-
return (!results.empty() && results[0] != g_nil ? results[0] : "");
207+
return (!results.empty() && results[0] != g_nil ? std::move(results[0]) : "");
208208
}
209209

210210
virtual int decr(std::string&& key)
@@ -254,7 +254,7 @@ namespace cpp_redis {
254254

255255
const auto results = res->get_results();
256256

257-
return ((!results.empty()) ? results[0] : "");
257+
return ((!results.empty()) ? std::move(results[0]) : "");
258258
}
259259

260260
virtual std::string get_set_key(std::string&& key, std::string&& value)
@@ -269,7 +269,7 @@ namespace cpp_redis {
269269

270270
const auto results = res->get_results();
271271

272-
return ((!results.empty()) ? results[0] : "");
272+
return ((!results.empty()) ? std::move(results[0]) : "");
273273
}
274274

275275
virtual std::string substr_reflect_value(std::string&& key, int start, int end)
@@ -284,7 +284,7 @@ namespace cpp_redis {
284284

285285
const auto results = res->get_results();
286286

287-
return ((!results.empty()) ? results[0] : "");
287+
return ((!results.empty()) ? std::move(results[0]) : "");
288288
}
289289

290290
virtual std::vector<std::string> multi_get_keys(std::vector<std::string>&&keys)
@@ -334,12 +334,12 @@ namespace cpp_redis {
334334
}
335335

336336
//在指定key追加值
337-
virtual int append_value(std::string&& key, std::string&& append_value)
337+
virtual int append_value(std::string&& key, std::string&& appended_value)
338338
{
339339
check_args();
340340

341341
std::string msg = request_->req_n_key(request_->get_cmd(cpp_redis::append),
342-
std::forward<std::string>(key), std::forward<std::string>(append_value));
342+
std::forward<std::string>(key), std::forward<std::string>(appended_value));
343343
socket_->send_msg(std::move(msg));
344344
const auto res = socket_->get_responese();
345345
if (res->get_result_code() != status::int_result_) {

‎include/cppredis/cpp_set_client.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ namespace cpp_redis {
9191
return "";
9292
}
9393

94-
return ((result[0] == g_nil) ? "" : result[0]);
94+
return ((result[0] == g_nil) ? "" : std::move(result[0]));
9595
}
9696

9797
//count >0表示元素不会重复, <0表示元素会重复

‎include/cppredis/cpp_zset_client.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace cpp_redis {
4343
return "";
4444
}
4545

46-
return ((results[0] == g_nil) ? "" :results[0]);
46+
return ((results[0] == g_nil) ? "" :std::move(results[0]));
4747
}
4848

4949
virtual std::string zset_incrby(std::string&& key,std::string&& increment,std::string&& member)
@@ -63,7 +63,7 @@ namespace cpp_redis {
6363
return "";
6464
}
6565

66-
return ((results[0] == g_nil) ? "" : results[0]);
66+
return ((results[0] == g_nil) ? "" : std::move(results[0]));
6767
}
6868

6969
virtual int zset_card(std::string&& key)

0 commit comments

Comments
 (0)