macos variant fixes

llarp/handlers/tun.cpp

@@ -596,7 +596,7 @@ namespace llarp
 
         if (auto maybe = ObtainAddrForIP(ip))
         {
-          std::visit([&msg](auto&& result) { msg.AddAReply(result.ToString()); }, *maybe);
+          var::visit([&msg](auto&& result) { msg.AddAReply(result.ToString()); }, *maybe);
           reply(msg);
           return true;
         }
@@ -1111,7 +1111,7 @@ namespace llarp
       AlignedBuffer<32> ident{};
       bool snode = false;
 
-      std::visit([&ident](auto&& val) { ident = val.data(); }, addr);
+      var::visit([&ident](auto&& val) { ident = val.data(); }, addr);
 
       if (std::get_if<RouterID>(&addr))
       {

llarp/quic/client.cpp

@@ -52,7 +52,7 @@ namespace llarp::quic
       return nullptr;
     if (auto* wptr = std::get_if<alias_conn_ptr>(&it->second))
       return wptr->lock();
-    return std::get<primary_conn_ptr>(it->second);
+    return var::get<primary_conn_ptr>(it->second);
   }
 
   size_t

llarp/quic/stream.hpp

@@ -259,8 +259,8 @@ namespace llarp::quic
     {
       return std::static_pointer_cast<T>(
           std::holds_alternative<std::shared_ptr<void>>(user_data)
-              ? std::get<std::shared_ptr<void>>(user_data)
-              : std::get<std::weak_ptr<void>>(user_data).lock());
+              ? var::get<std::shared_ptr<void>>(user_data)
+              : var::get<std::weak_ptr<void>>(user_data).lock());
     }
 
     // Returns a reference to the connection that owns this stream