From c5b26acad84d64af62dab2bc6944adfaae238c25 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 14 Apr 2018 16:10:44 -0600 Subject: [PATCH] Use boost::filesystem::path::string() instead of path::native() This fixes a mingw32 conversion error during cross-compilation. --- src/gtest/test_paymentdisclosure.cpp | 2 +- src/test/rpc_wallet_tests.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gtest/test_paymentdisclosure.cpp b/src/gtest/test_paymentdisclosure.cpp index ce1322dbb..c166cdbe1 100644 --- a/src/gtest/test_paymentdisclosure.cpp +++ b/src/gtest/test_paymentdisclosure.cpp @@ -99,7 +99,7 @@ TEST(paymentdisclosure, mainnet) { boost::filesystem::create_directories(pathTemp); mapArgs["-datadir"] = pathTemp.string(); - std::cout << "Test payment disclosure database created in folder: " << pathTemp.native() << std::endl; + std::cout << "Test payment disclosure database created in folder: " << pathTemp.string() << std::endl; PaymentDisclosureDBTest mydb(pathTemp); diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp index edbcb6552..119acc0c3 100644 --- a/src/test/rpc_wallet_tests.cpp +++ b/src/test/rpc_wallet_tests.cpp @@ -421,7 +421,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_exportwallet) BOOST_CHECK_THROW(CallRPC(string("z_exportwallet ") + tmpfilename.string()), runtime_error); // set exportdir - mapArgs["-exportdir"] = tmppath.native(); + mapArgs["-exportdir"] = tmppath.string(); // run some tests BOOST_CHECK_THROW(CallRPC("z_exportwallet"), runtime_error); @@ -501,7 +501,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importwallet) // write test data to file boost::filesystem::path temp = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path(); - const std::string path = temp.native(); + const std::string path = temp.string(); std::ofstream file(path); file << testWalletDump; file << std::flush;