From 44c1d160c83405b909d5ff339d572051becbd6c1 Mon Sep 17 00:00:00 2001 From: iDunk5400 Date: Sun, 8 Oct 2017 23:59:08 +0200 Subject: [PATCH] unit_tests: fix compiling on Windows --- tests/unit_tests/epee_utils.cpp | 4 +--- tests/unit_tests/serialization.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/unit_tests/epee_utils.cpp b/tests/unit_tests/epee_utils.cpp index f6cb0c163..a13081491 100644 --- a/tests/unit_tests/epee_utils.cpp +++ b/tests/unit_tests/epee_utils.cpp @@ -37,9 +37,7 @@ #include #include -#ifdef _WIN32 -# include -#else +#ifndef _WIN32 # include #endif diff --git a/tests/unit_tests/serialization.cpp b/tests/unit_tests/serialization.cpp index e701a53ce..61e8b3f8d 100644 --- a/tests/unit_tests/serialization.cpp +++ b/tests/unit_tests/serialization.cpp @@ -677,7 +677,7 @@ TEST(Serialization, portability_wallet) bool r = false; try { - w.load(wallet_file.native(), password); + w.load(wallet_file.string(), password); r = true; } catch (const exception& e) @@ -794,7 +794,7 @@ TEST(Serialization, portability_outputs) // read file const boost::filesystem::path filename = unit_test::data_dir / "outputs"; std::string data; - bool r = epee::file_io_utils::load_file_to_string(filename.native(), data); + bool r = epee::file_io_utils::load_file_to_string(filename.string(), data); ASSERT_TRUE(r); const size_t magiclen = strlen(OUTPUT_EXPORT_FILE_MAGIC); ASSERT_FALSE(data.size() < magiclen || memcmp(data.data(), OUTPUT_EXPORT_FILE_MAGIC, magiclen)); @@ -910,7 +910,7 @@ TEST(Serialization, portability_unsigned_tx) const boost::filesystem::path filename = unit_test::data_dir / "unsigned_monero_tx"; std::string s; const bool testnet = true; - bool r = epee::file_io_utils::load_file_to_string(filename.native(), s); + bool r = epee::file_io_utils::load_file_to_string(filename.string(), s); ASSERT_TRUE(r); const size_t magiclen = strlen(UNSIGNED_TX_PREFIX); ASSERT_FALSE(strncmp(s.c_str(), UNSIGNED_TX_PREFIX, magiclen)); @@ -1058,7 +1058,7 @@ TEST(Serialization, portability_signed_tx) const boost::filesystem::path filename = unit_test::data_dir / "signed_monero_tx"; const bool testnet = true; std::string s; - bool r = epee::file_io_utils::load_file_to_string(filename.native(), s); + bool r = epee::file_io_utils::load_file_to_string(filename.string(), s); ASSERT_TRUE(r); const size_t magiclen = strlen(SIGNED_TX_PREFIX); ASSERT_FALSE(strncmp(s.c_str(), SIGNED_TX_PREFIX, magiclen));