commit e152f72df9c5a34c0f5041925131487280646477
author Laszlo Csomor <laszlocsomor@google.com> Fri Feb 03 10:05:36 2017 +0000
committer Yun Peng <pcloudy@google.com> Fri Feb 03 10:26:52 2017 +0000
tree e5766bb1d7f86b5a160bcd2bbcbb11ec10d8f15a
parent 99da64215e2318ee3967dd928e5842680d58f7c9

Bazel client, Windows: fix compilation for MSVC

Fixes https://github.com/bazelbuild/bazel/issues/2479
See https://github.com/bazelbuild/bazel/issues/2107

--
PiperOrigin-RevId: 146454894
MOS_MIGRATED_REVID=146454894

src/main/cpp/blaze_util_windows.cc

diff --git a/src/main/cpp/blaze_util_windows.cc b/src/main/cpp/blaze_util_windows.cc
index 9444a5c..3115567 100644
--- a/src/main/cpp/blaze_util_windows.cc
+++ b/src/main/cpp/blaze_util_windows.cc
@@ -34,6 +34,7 @@
 #include <sstream>
 #include <thread>  // NOLINT (to slience Google-internal linter)
 #include <type_traits>  // static_assert
+#include <vector>
 
 #include "src/main/cpp/blaze_util.h"
 #include "src/main/cpp/blaze_util_platform.h"
@@ -73,7 +74,6 @@
 
 using std::string;
 using std::unique_ptr;
-using std::vector;
 using std::wstring;
 
 SignalHandler SignalHandler::INSTANCE;
@@ -379,7 +379,7 @@
   char cmdline[MAX_CMDLINE_LENGTH];
 };
 static void CreateCommandLine(CmdLine* result, const string& exe,
-                              const vector<string>& args_vector) {
+                              const std::vector<string>& args_vector) {
   std::ostringstream cmdline;
   string short_exe;
   if (!blaze_util::AsShortWindowsPath(exe, &short_exe)) {
@@ -718,8 +718,7 @@
 
 // Run the given program in the current working directory,
 // using the given argument vector.
-void ExecuteProgram(
-    const string& exe, const vector<string>& args_vector) {
+void ExecuteProgram(const string& exe, const std::vector<string>& args_vector) {
   CmdLine cmdline;
   CreateCommandLine(&cmdline, exe, args_vector);
 
@@ -992,7 +991,8 @@
     return false;
   }
 
-  vector<char> print_name(reparse_buffer->PrintNameLength * sizeof(WCHAR) + 1);
+  std::vector<char> print_name(reparse_buffer->PrintNameLength * sizeof(WCHAR) +
+                               1);
   int count = ::WideCharToMultiByte(
       CP_UTF8,
       0,
@@ -1402,7 +1402,7 @@
   // Windows console attached so GetConsoleScreenBufferInfo fails.
   windows_util::AutoHandle stdout_handle(::GetStdHandle(STD_OUTPUT_HANDLE));
   CONSOLE_SCREEN_BUFFER_INFO screen_info;
-  if (GetConsoleScreenBufferInfo(stdout_handle, &screen_info)) {
+  if (GetConsoleScreenBufferInfo(stdout_handle.handle, &screen_info)) {
     int width = 1 + screen_info.srWindow.Right - screen_info.srWindow.Left;
     if (width > 1) {
       return width;