diff --git a/CMakeLists.txt b/CMakeLists.txt index 20e01aa2..59d61a4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ if (UNIX AND NOT APPLE) else() # multi configurations for MSVC and XCode if(CMAKE_SYSTEM_NAME STREQUAL "iOS") - set(CMAKE_CONFIGURATION_TYPES "Release") + set(CMAKE_CONFIGURATION_TYPES "Debug;Release") elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") set(CMAKE_CONFIGURATION_TYPES "Debug;Release") else() diff --git a/contrib/epee/include/file_io_utils.h b/contrib/epee/include/file_io_utils.h index 7ece78b1..9d5118cb 100644 --- a/contrib/epee/include/file_io_utils.h +++ b/contrib/epee/include/file_io_utils.h @@ -35,6 +35,7 @@ #include #include #include +#include #ifndef MAKE64 #define MAKE64(low,high) ((__int64)(((DWORD)(low)) | ((__int64)((DWORD)(high))) << 32)) @@ -561,16 +562,15 @@ namespace file_io_utils try { - boost::filesystem::directory_iterator end_itr; // default construction yields past-the-end - for ( boost::filesystem::directory_iterator itr( epee::string_encoding::utf8_to_wstring(path) ); itr != end_itr; ++itr ) + std::filesystem::directory_iterator end_itr; // default construction yields past-the-end + for ( std::filesystem::directory_iterator itr( epee::string_encoding::utf8_to_wstring(path) ); itr != end_itr; ++itr ) { - if ( only_files && boost::filesystem::is_directory(itr->status()) ) + if ( only_files && std::filesystem::is_directory(itr->status()) ) { continue; } target_list.push_back(itr->path().filename().string()); } - } catch(...) diff --git a/tests/performance_tests/main.cpp b/tests/performance_tests/main.cpp index eefed6c3..58fbd85f 100644 --- a/tests/performance_tests/main.cpp +++ b/tests/performance_tests/main.cpp @@ -35,8 +35,12 @@ POP_VS_WARNINGS void test_plain_wallet() { //std::string res = plain_wallet::init("195.201.107.230", "33336", "E:\\tmp\\", 0); - std::string res = plain_wallet::init("127.0.0.1", "12111", "C:\\Users\\roky\\home\\", 0); + std::string res = plain_wallet::init("127.0.0.1", "12111", "C:\\Users\\roky\\home22\\", 0); + + std::string res___ = plain_wallet::get_wallet_files(); + + uint64_t instance_id = 0; res = plain_wallet::open("test_restored_2.zan", "111"); //res = plain_wallet::restore("", @@ -53,7 +57,6 @@ void test_plain_wallet() break; } - std::string invoke_body = "{\"method\":\"store\",\"params\":{}}"; std::string res1 = plain_wallet::sync_call("invoke", instance_id, invoke_body);