Merge pull request #263 from graft-project/fix/osx-build

Fix compilation errors for cryptonode on OSX
graft-project · Mar 20, 2019 · 1212969 · 1212969
2 parents eaa69c6 + 13c2014
commit 1212969
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -435,6 +435,9 @@ else()
   include(TestCXXAcceptsFlag)
   set(ARCH native CACHE STRING "CPU to build for: -march value or 'default' to not pass -march at all")
   message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}")
+  if(APPLE)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lz")
+  endif()
   if(ARCH STREQUAL "default")
     set(ARCH_FLAG "")
   elseif(PPC64LE)

diff --git a/src/debug_utilities/daa_process.cpp b/src/debug_utilities/daa_process.cpp
@@ -148,7 +148,7 @@ class DAA_Tester
         size_t begin, end;
         if (m_counter < DIFFICULTY_WINDOW + DIFFICULTY_LAG) {
             begin = 0;
-            end = min(m_counter, (size_t) DIFFICULTY_WINDOW);
+            end = min(m_counter, (uint64_t) DIFFICULTY_WINDOW);
         } else {
             end = m_counter - DIFFICULTY_LAG;
             begin = end - DIFFICULTY_WINDOW;

diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h
@@ -226,7 +226,7 @@ namespace nodetool
         typename request_struct::response resp = AUTO_VAL_INIT(resp);
         bool r = epee::net_utils::invoke_http_json(m_supernode_uri + uri,
                                                    req, resp, m_supernode_client,
-                                                   std::chrono::milliseconds(SUPERNODE_HTTP_TIMEOUT_MILLIS), "POST");
+                                                   std::chrono::milliseconds(size_t(SUPERNODE_HTTP_TIMEOUT_MILLIS)), "POST");
         if (!r || resp.status == 0)
         {
             return 0;

diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
@@ -464,7 +464,7 @@ namespace nodetool
     {
         for (const auto& na : m_custom_seed_nodes)
         {
-            const auto& ipv4 = na.as<const epee::net_utils::ipv4_network_address>();
+            const auto& ipv4 = na.template as<const epee::net_utils::ipv4_network_address>();
             full_addrs.insert(epee::string_tools::get_ip_string_from_int32(ipv4.ip()) + ":"
                               + epee::string_tools::num_to_string_fast(ipv4.port()) );
         }