Skip to content
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

Remove C++11 features in io_win32.cc #3536

Merged
merged 2 commits into from
Aug 21, 2017
Merged

Remove C++11 features in io_win32.cc #3536

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aadcd3
Remove C++11 features in io_win32.cc
liujisi Aug 21, 2017
77a453a
Fix compile errors
liujisi Aug 21, 2017
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
30 changes: 15 additions & 15 deletions src/google/protobuf/stubs/io_win32.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
#include <windows.h>

#include <google/protobuf/stubs/io_win32.h>
#include <google/protobuf/stubs/scoped_ptr.h>

#include <cassert>
#include <memory>
Expand All @@ -71,7 +72,6 @@ namespace win32 {
namespace {

using std::string;
using std::unique_ptr;
using std::wstring;

template <typename char_type>
Expand Down Expand Up @@ -139,11 +139,11 @@ string join_paths(const string& path1, const string& path2) {
return path1;
}

if (is_separator(path1.back())) {
return is_separator(path2.front()) ? (path1 + path2.substr(1))
if (is_separator(path1[path1.size() - 1])) {
return is_separator(path2[0]) ? (path1 + path2.substr(1))
: (path1 + path2);
} else {
return is_separator(path2.front()) ? (path1 + path2)
return is_separator(path2[0]) ? (path1 + path2)
: (path1 + '\\' + path2);
}
}
Expand Down Expand Up @@ -203,24 +203,24 @@ string normalize(string path) {
result << s;
}
// Preserve trailing separator if the input contained it.
if (is_separator(path.back())) {
if (!path.empty() && is_separator(path[path.size() - 1])) {
result << '\\';
}
return result.str();
}

std::unique_ptr<WCHAR[]> as_wstring(const string& s) {
WCHAR* as_wstring(const string& s) {
int len = ::MultiByteToWideChar(CP_UTF8, 0, s.c_str(), s.size(), NULL, 0);
std::unique_ptr<WCHAR[]> result(new WCHAR[len + 1]);
::MultiByteToWideChar(CP_UTF8, 0, s.c_str(), s.size(), result.get(), len + 1);
result.get()[len] = 0;
return std::move(result);
WCHAR* result = new WCHAR[len + 1];
::MultiByteToWideChar(CP_UTF8, 0, s.c_str(), s.size(), result, len + 1);
result[len] = 0;
return result;
}

wstring as_wchar_path(const string& path) {
std::unique_ptr<WCHAR[]> wbuf(as_wstring(path));
void as_wchar_path(const string& path, wstring* wchar_path) {
scoped_array<WCHAR> wbuf(as_wstring(path));
replace_directory_separators(wbuf.get());
return wstring(wbuf.get());
wchar_path->assign(wbuf.get());
}

bool as_windows_path(const string& path, wstring* result) {
Expand All @@ -239,7 +239,7 @@ bool as_windows_path(const string& path, wstring* result) {
::GetCurrentDirectoryA(MAX_PATH, cwd);
mutable_path = join_paths(cwd, mutable_path);
}
*result = as_wchar_path(normalize(mutable_path));
as_wchar_path(normalize(mutable_path), result);
if (!has_longpath_prefix(result->c_str())) {
// Add the "\\?\" prefix unconditionally. This way we prevent the Win32 API
// from processing the path and "helpfully" removing trailing dots from the
Expand Down Expand Up @@ -324,7 +324,7 @@ FILE* fopen(const char* path, const char* mode) {
errno = ENOENT;
return NULL;
}
std::unique_ptr<WCHAR[]> wmode(as_wstring(mode));
scoped_array<WCHAR> wmode(as_wstring(mode));
return ::_wfopen(wpath.c_str(), wmode.get());
#else
return ::fopen(path, mode);
Expand Down