Fix errors and warnings compiling on mac

CMakeLists.txt

@@ -158,7 +158,8 @@ if (NOT MSVC_VERSION)
 	add_compile_options(-Wno-unused-function -Wno-deprecated-declarations -Wno-unknown-pragmas)
 endif()
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  # STREQUAL because AppleClang's libc++ doesn't yet support thread safety annotations
   add_compile_options(-Wthread-safety)
 endif()
 

llarp/dht/explorenetworkjob.cpp

@@ -17,7 +17,7 @@ namespace llarp
     {
       auto msg = new FindRouterMessage(peer.txid);
       auto router = parent->GetRouter();
-      router->NotifyRouterEvent<tooling::FindRouterSentEvent>(router->pubkey(), msg);
+      router->NotifyRouterEvent<tooling::FindRouterSentEvent>(router->pubkey(), *msg);
 
       parent->DHTSendTo(peer.node.as_array(), msg);
     }

llarp/dht/messages/findrouter.cpp

@@ -152,7 +152,7 @@ namespace llarp
       auto& dht = *ctx->impl;
 
       auto router = dht.GetRouter();
-      router->NotifyRouterEvent<tooling::FindRouterReceivedEvent>(router->pubkey(), this);
+      router->NotifyRouterEvent<tooling::FindRouterReceivedEvent>(router->pubkey(), *this);
 
       if (!dht.AllowTransit())
       {

llarp/router/router.hpp

@@ -477,10 +477,10 @@ namespace llarp
     HasSessionTo(const RouterID& remote) const override;
 
     std::string
-    ShortName() const;
+    ShortName() const override;
 
     uint32_t
-    NextPathBuildNumber();
+    NextPathBuildNumber() override;
 
     void
     handle_router_ticker();

llarp/service/endpoint.cpp

@@ -777,8 +777,9 @@ namespace llarp
 
           assert(msg.M.size() == 1);
           auto dhtMsg = dynamic_cast<FindRouterMessage*>(msg.M[0].get());
+          assert(dhtMsg != nullptr);
 
-          m_router->NotifyRouterEvent<tooling::FindRouterSentEvent>(m_router->pubkey(), dhtMsg);
+          m_router->NotifyRouterEvent<tooling::FindRouterSentEvent>(m_router->pubkey(), *dhtMsg);
 
           routers.emplace(router, RouterLookupJob(this, handler));
           return true;