lokimq rename compatibility fix

This commit is contained in:
Jason Rhinelander 2021-01-15 15:15:53 -04:00
parent 71f16f04fa
commit e7ec8bec41
3 changed files with 63 additions and 2 deletions

View File

@ -0,0 +1,60 @@
From: Jason Rhinelander <jason@imaginary.ca>
Date: Fri, 15 Jan 2021 14:39:33 -0400
Subject: lokimq rename compatibility fix
---
llarp/router/abstractrouter.hpp | 6 +++---
llarp/router_contact.hpp | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/llarp/router/abstractrouter.hpp b/llarp/router/abstractrouter.hpp
index ca53fc9..f4c0357 100644
--- a/llarp/router/abstractrouter.hpp
+++ b/llarp/router/abstractrouter.hpp
@@ -23,9 +23,9 @@ struct llarp_dht_context;
struct llarp_nodedb;
struct llarp_threadpool;
-namespace lokimq
+namespace oxenmq
{
- class LokiMQ;
+ class OxenMQ;
}
namespace llarp
@@ -75,7 +75,7 @@ namespace llarp
class ThreadPool;
}
- using LMQ_ptr = std::shared_ptr<lokimq::LokiMQ>;
+ using LMQ_ptr = std::shared_ptr<oxenmq::OxenMQ>;
struct AbstractRouter
{
diff --git a/llarp/router_contact.hpp b/llarp/router_contact.hpp
index be29e76..2fb9cbf 100644
--- a/llarp/router_contact.hpp
+++ b/llarp/router_contact.hpp
@@ -17,10 +17,10 @@
#define MAX_RC_SIZE (1024)
#define NICKLEN (32)
-namespace lokimq
+namespace oxenmq
{
class bt_list_consumer;
-} // namespace lokimq
+} // namespace oxenmq
namespace llarp
{
@@ -230,7 +230,7 @@ namespace llarp
DecodeVersion_0(llarp_buffer_t* buf);
bool
- DecodeVersion_1(lokimq::bt_list_consumer& btlist);
+ DecodeVersion_1(oxenmq::bt_list_consumer& btlist);
};
inline std::ostream&

View File

@ -8,10 +8,10 @@ Rather than cramming it into CXXFLAGS in debian/rules.
1 file changed, 3 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dac39e8..f46ee2c 100644
index cec1825..3783838 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,6 +109,9 @@ include(cmake/unix.cmake)
@@ -108,6 +108,9 @@ include(cmake/unix.cmake)
include(cmake/check_for_std_optional.cmake)
include(cmake/check_for_std_filesystem.cmake)

View File

@ -1,3 +1,4 @@
0004-Make-root-bootstraps-to-system-path.patch
0005-Move-default-user-group-into-deb-patch.patch
0007-Pass-debian-version-as-GIT_VERSION.patch
0004-lokimq-rename-compatibility-fix.patch