From cfbdd357cbed555f8a09d186dbc1f26943002c1c Mon Sep 17 00:00:00 2001 From: Harald Nielsen Date: Wed, 13 Dec 2023 09:57:56 +0100 Subject: [PATCH] make to match google style for vars --- src/google/protobuf/compiler/command_line_interface.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc index d6f4e2e98367d..0b48c9c5bba16 100644 --- a/src/google/protobuf/compiler/command_line_interface.cc +++ b/src/google/protobuf/compiler/command_line_interface.cc @@ -1771,16 +1771,16 @@ bool CommandLineInterface::ExpandArgumentFile( #ifdef _MSC_VER // Convert the file name to wide chars. int size = MultiByteToWideChar(CP_UTF8, 0, file, strlen(file), NULL, 0); - std::wstring fileStr; - fileStr.resize(size); - MultiByteToWideChar(CP_UTF8, 0, file, strlen(file), &fileStr[0], fileStr.size()); + std::wstring file_str; + file_str.resize(size); + MultiByteToWideChar(CP_UTF8, 0, file, strlen(file), &file_str[0], file_str.size()); #else - std::string fileStr(file); + std::string file_str(file); #endif // The argument file is searched in the working directory only. We don't // use the proto import path here. - std::ifstream file_stream(fileStr.c_str()); + std::ifstream file_stream(file_str.c_str()); if (!file_stream.is_open()) { return false; }