From ddbd670da6ed21c5b85e52916d3d8305ea026f2c Mon Sep 17 00:00:00 2001 From: VC++ Workspaces Account Date: Fri, 26 Apr 2019 02:06:29 -0700 Subject: [PATCH 1/2] [C++]Fixes compiler warning in recent VS updates --- cpp/src/arrow/vendored/datetime/tz.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cpp/src/arrow/vendored/datetime/tz.cpp b/cpp/src/arrow/vendored/datetime/tz.cpp index e05423e13c6..6b4b68de15f 100644 --- a/cpp/src/arrow/vendored/datetime/tz.cpp +++ b/cpp/src/arrow/vendored/datetime/tz.cpp @@ -202,7 +202,12 @@ get_known_folder(const GUID& folderid) if (SUCCEEDED(hr)) { co_task_mem_ptr folder_ptr(pfolder); - folder = std::string(folder_ptr.get(), folder_ptr.get() + wcslen(folder_ptr.get())); + folder.clear(); + folder.reserve(wcslen(folder_ptr.get())); + for (std::size_t idx = 0; idx != wcslen(folder_ptr.get()); ++idx) + { + folder.push_back(static_cast(folder_ptr[idx])); + } } return folder; } From 017e3e7f3bc69ebbeef86c05e7c9a52f8b68eadd Mon Sep 17 00:00:00 2001 From: VC++ Workspaces Account Date: Mon, 29 Apr 2019 23:03:00 -0700 Subject: [PATCH 2/2] [C++]Disable compiler warning C4244 --- cpp/src/arrow/vendored/datetime/tz.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cpp/src/arrow/vendored/datetime/tz.cpp b/cpp/src/arrow/vendored/datetime/tz.cpp index 6b4b68de15f..bfc304ed474 100644 --- a/cpp/src/arrow/vendored/datetime/tz.cpp +++ b/cpp/src/arrow/vendored/datetime/tz.cpp @@ -202,12 +202,10 @@ get_known_folder(const GUID& folderid) if (SUCCEEDED(hr)) { co_task_mem_ptr folder_ptr(pfolder); - folder.clear(); - folder.reserve(wcslen(folder_ptr.get())); - for (std::size_t idx = 0; idx != wcslen(folder_ptr.get()); ++idx) - { - folder.push_back(static_cast(folder_ptr[idx])); - } + #pragma warning(push) + #pragma warning(disable : 4244) + folder = std::string(folder_ptr.get(), folder_ptr.get() + wcslen(folder_ptr.get())); + #pragma warning(pop) } return folder; }