Skip to content

returning std::move causing build failure on osx #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

returning std::move causing build failure on osx #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Release/src/http/common/http_helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ utf16string convert_utf16_to_utf16(utf16string src)
{
case little_endian:
src.erase(0, 1);
return std::move(src);
return src;
case big_endian:
return convert_utf16be_to_utf16le(std::move(src), true);
case unknown:
Expand Down Expand Up @@ -313,7 +313,7 @@ static utf16string big_endian_to_little_endian(utf16string src, bool erase_bom)
}
if (src.empty())
{
return std::move(src);
return src;
}

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

return std::move(src);
return src;
}

utility::string_t convert_utf16be_to_string_t(utf16string src, bool erase_bom)
Expand Down
4 changes: 2 additions & 2 deletions Release/src/utilities/asyncrt_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,13 +486,13 @@ utility::string_t __cdecl conversions::to_string_t(const std::string &s)
#endif
}

std::string __cdecl conversions::to_utf8string(std::string value) { return std::move(value); }
std::string __cdecl conversions::to_utf8string(std::string value) { return value; }

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

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

utf16string __cdecl conversions::to_utf16string(utf16string value) { return std::move(value); }
utf16string __cdecl conversions::to_utf16string(utf16string value) { return value; }

#ifndef WIN32
datetime datetime::timeval_to_datetime(const timeval &time)
Expand Down