Skip to content

Commit 29ba42e

Browse files
committed
Merge pull request microsoft#114 from leighsmith/xcode7.3
Removed redundant std::move() that was causing errors on Xcode 7.3 gcc
2 parents fb4aba9 + f063765 commit 29ba42e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Release/src/http/common/http_helpers.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ utf16string convert_utf16_to_utf16(utf16string src)
272272
{
273273
case little_endian:
274274
src.erase(0, 1);
275-
return std::move(src);
275+
return src;
276276
case big_endian:
277277
return convert_utf16be_to_utf16le(std::move(src), true);
278278
case unknown:
@@ -313,7 +313,7 @@ static utf16string big_endian_to_little_endian(utf16string src, bool erase_bom)
313313
}
314314
if (src.empty())
315315
{
316-
return std::move(src);
316+
return src;
317317
}
318318

319319
const size_t size = src.size();
@@ -324,7 +324,7 @@ static utf16string big_endian_to_little_endian(utf16string src, bool erase_bom)
324324
src[i] = static_cast<utf16char>(src[i] | ch >> 8);
325325
}
326326

327-
return std::move(src);
327+
return src;
328328
}
329329

330330
utility::string_t convert_utf16be_to_string_t(utf16string src, bool erase_bom)

Release/src/utilities/asyncrt_utils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,13 +486,13 @@ utility::string_t __cdecl conversions::to_string_t(const std::string &s)
486486
#endif
487487
}
488488

489-
std::string __cdecl conversions::to_utf8string(std::string value) { return std::move(value); }
489+
std::string __cdecl conversions::to_utf8string(std::string value) { return value; }
490490

491491
std::string __cdecl conversions::to_utf8string(const utf16string &value) { return utf16_to_utf8(value); }
492492

493493
utf16string __cdecl conversions::to_utf16string(const std::string &value) { return utf8_to_utf16(value); }
494494

495-
utf16string __cdecl conversions::to_utf16string(utf16string value) { return std::move(value); }
495+
utf16string __cdecl conversions::to_utf16string(utf16string value) { return value; }
496496

497497
#ifndef WIN32
498498
datetime datetime::timeval_to_datetime(const timeval &time)

0 commit comments

Comments
 (0)