GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-08-11 11:28:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for warnings under VS2017.

Browse Source
This commit is contained in:
Steffen Schümann 2018-11-04 14:30:36 +01:00
parent 6c0f261262
commit f7854ed685
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
filesystem.h
View File

@ -1669,7 +1669,7 @@ inline u8arguments::u8arguments(int& argc, char**& argv)
p = ::CommandLineToArgvW(::GetCommandLineW(), &argc); p = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
_args.reserve(argc); _args.reserve(argc);
_argp.reserve(argc); _argp.reserve(argc);
for (size_t i = 0; i < argc; ++i) { for (size_t i = 0; i < static_cast<size_t>(argc); ++i) {
_args.push_back(detail::toUtf8(std::wstring(p[i]))); _args.push_back(detail::toUtf8(std::wstring(p[i])));
_argp.push_back((char*)_args[i].data()); _argp.push_back((char*)_args[i].data());
} }

5
test/CMakeLists.txt
View File

@ -1,5 +1,8 @@
add_executable(filesystem_test filesystem_test.cpp ../filesystem.h catch.hpp) add_executable(filesystem_test filesystem_test.cpp ../filesystem.h catch.hpp)
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
target_compile_definitions(filesystem_test PRIVATE _CRT_SECURE_NO_WARNINGS)
endif()
if(CMAKE_GENERATOR STREQUAL Xcode) if(CMAKE_GENERATOR STREQUAL Xcode)
add_executable(filesystem_test_cov filesystem_test.cpp ../filesystem.h catch.hpp) add_executable(filesystem_test_cov filesystem_test.cpp ../filesystem.h catch.hpp)
target_compile_options(filesystem_test_cov PRIVATE "$<$<CONFIG:DEBUG>:--coverage>") target_compile_options(filesystem_test_cov PRIVATE "$<$<CONFIG:DEBUG>:--coverage>")
@ -26,5 +29,5 @@ if(CMAKE_CXX_COMPILER_ID MATCHES MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_EQ
add_executable(std_filesystem_test filesystem_test.cpp ../filesystem.h catch.hpp) add_executable(std_filesystem_test filesystem_test.cpp ../filesystem.h catch.hpp)
set_property(TARGET std_filesystem_test PROPERTY CXX_STANDARD 17) set_property(TARGET std_filesystem_test PROPERTY CXX_STANDARD 17)
target_compile_options(std_filesystem_test PRIVATE "/Zc:__cplusplus") target_compile_options(std_filesystem_test PRIVATE "/Zc:__cplusplus")
target_compile_definitions(std_filesystem_test PRIVATE USE_STD_FS) target_compile_definitions(std_filesystem_test PRIVATE USE_STD_FS _CRT_SECURE_NO_WARNINGS)
endif() endif()