more macOS compilation fixes

cryptozoidberg · Feb 14, 2019 · 5f1b927 · 5f1b927
1 parent 443c00f
commit 5f1b927
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp
@@ -1247,7 +1247,7 @@ namespace currency
         txin_to_key& tk = boost::get<txin_to_key>(in);
         tei.ins.back().amount = tk.amount;
         tei.ins.back().kimage_or_ms_id = epee::string_tools::pod_to_hex(tk.k_image);
-        std::vector<size_t> absolute_offsets = relative_output_offsets_to_absolute(tk.key_offsets);
+        std::vector<uint64_t> absolute_offsets = relative_output_offsets_to_absolute(tk.key_offsets);
         for (auto& ao : absolute_offsets)
         {
           tei.ins.back().global_indexes.push_back(0);

diff --git a/tests/functional_tests/transactions_flow_test.cpp b/tests/functional_tests/transactions_flow_test.cpp
@@ -6,6 +6,7 @@
 #include <boost/uuid/random_generator.hpp>
 #include <unordered_map>
 #include "include_base_utils.h"
+#include "string_coding.h"
 using namespace epee;
 #include "storages/http_abstract_invoke.h"
 
@@ -95,8 +96,8 @@ bool transactions_flow_test(std::string& working_folder,
 
   try
   {
-    w1.generate(working_folder + "/" + path_source_wallet, "");
-    w2.generate(working_folder + "/" + path_terget_wallet, "");
+    w1.generate(string_encoding::convert_to_unicode(working_folder + "/" + path_source_wallet), "");
+    w2.generate(string_encoding::convert_to_unicode(working_folder + "/" + path_terget_wallet), "");
   }
   catch (const std::exception& e)
   {