Merge pull request #38 from marlinprotocol/build_fixes

Build fixes
marlinprotocol · Dec 25, 2020 · f171f7e · f171f7e
2 parents 3f638fc + e09df96
commit f171f7e
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/beacon/CMakeLists.txt b/beacon/CMakeLists.txt
@@ -38,6 +38,9 @@ target_link_libraries(beacon INTERFACE spdlog::spdlog_header_only)
 # Boost::iterator
 target_link_libraries(beacon INTERFACE Boost::iterator)
 
+# Boost::filesystem
+target_link_libraries(beacon INTERFACE Boost::filesystem)
+
 install(TARGETS beacon
 	EXPORT marlin-beacon-export
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

diff --git a/beacon/examples/crawler.cpp b/beacon/examples/crawler.cpp
@@ -5,7 +5,7 @@
 #include <marlin/asyncio/core/EventLoop.hpp>
 #include <cstring>
 #include <fstream>
-#include <experimental/filesystem>
+#include <boost/filesystem.hpp>
 
 #include "spdlog/fmt/bin_to_hex.h"
 

diff --git a/beacon/examples/discovery.cpp b/beacon/examples/discovery.cpp
@@ -5,7 +5,7 @@
 #include <marlin/asyncio/core/EventLoop.hpp>
 #include <cstring>
 #include <fstream>
-#include <experimental/filesystem>
+#include <boost/filesystem.hpp>
 
 #include "spdlog/fmt/bin_to_hex.h"
 
@@ -47,7 +47,7 @@ int main() {
 	uint8_t static_sk[crypto_box_SECRETKEYBYTES];
 	uint8_t static_pk[crypto_box_PUBLICKEYBYTES];
 
-	if(std::experimental::filesystem::exists("./.marlin/keys/static")) {
+	if(boost::filesystem::exists("./.marlin/keys/static")) {
 		std::ifstream sk("./.marlin/keys/static", std::ios::binary);
 		if(!sk.read((char *)static_sk, crypto_box_SECRETKEYBYTES)) {
 			throw;
@@ -56,7 +56,7 @@ int main() {
 	} else {
 		crypto_box_keypair(static_pk, static_sk);
 
-		std::experimental::filesystem::create_directories("./.marlin/keys/");
+		boost::filesystem::create_directories("./.marlin/keys/");
 		std::ofstream sk("./.marlin/keys/static", std::ios::binary);
 
 		sk.write((char *)static_sk, crypto_box_SECRETKEYBYTES);

diff --git a/pubsub/include/marlin/pubsub/PubSubNode.hpp b/pubsub/include/marlin/pubsub/PubSubNode.hpp
@@ -1240,7 +1240,7 @@ void PUBSUBNODETYPE::send_message_on_channel(
 	uint16_t channel,
 	uint64_t message_id,
 	const uint8_t *data,
-	size_t size,
+	uint64_t size,
 	core::SocketAddress const *excluded,
 	MessageHeaderType prev_header
 ) {

diff --git a/stream/CMakeLists.txt b/stream/CMakeLists.txt
@@ -35,6 +35,9 @@ target_link_libraries(stream INTERFACE marlin::asyncio)
 # spdlog
 target_link_libraries(stream INTERFACE spdlog::spdlog_header_only)
 
+# Boost::filesystem
+target_link_libraries(stream INTERFACE Boost::filesystem)
+
 install(TARGETS stream
 	EXPORT marlin-stream-export
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

diff --git a/stream/examples/client.cpp b/stream/examples/client.cpp
@@ -3,7 +3,7 @@
 #include <spdlog/spdlog.h>
 #include <spdlog/fmt/bin_to_hex.h>
 #include <fstream>
-#include <experimental/filesystem>
+#include <boost/filesystem.hpp>
 
 using namespace marlin::core;
 using namespace marlin::asyncio;
@@ -85,7 +85,7 @@ struct Delegate {
 };
 
 int main() {
-	if(std::experimental::filesystem::exists("./.marlin/keys/static")) {
+	if(boost::filesystem::exists("./.marlin/keys/static")) {
 		std::ifstream sk("./.marlin/keys/static", std::ios::binary);
 		if(!sk.read((char *)static_sk, crypto_box_SECRETKEYBYTES)) {
 			throw;
@@ -94,7 +94,7 @@ int main() {
 	} else {
 		crypto_box_keypair(static_pk, static_sk);
 
-		std::experimental::filesystem::create_directories("./.marlin/keys/");
+		boost::filesystem::create_directories("./.marlin/keys/");
 		std::ofstream sk("./.marlin/keys/static", std::ios::binary);
 
 		sk.write((char *)static_sk, crypto_box_SECRETKEYBYTES);

diff --git a/stream/examples/server.cpp b/stream/examples/server.cpp
@@ -3,7 +3,7 @@
 #include <spdlog/spdlog.h>
 #include <spdlog/fmt/bin_to_hex.h>
 #include <fstream>
-#include <experimental/filesystem>
+#include <boost/filesystem.hpp>
 
 using namespace marlin::core;
 using namespace marlin::asyncio;
@@ -85,7 +85,7 @@ struct Delegate {
 };
 
 int main() {
-	if(std::experimental::filesystem::exists("./.marlin/keys/static")) {
+	if(boost::filesystem::exists("./.marlin/keys/static")) {
 		std::ifstream sk("./.marlin/keys/static", std::ios::binary);
 		if(!sk.read((char *)static_sk, crypto_box_SECRETKEYBYTES)) {
 			throw;
@@ -94,7 +94,7 @@ int main() {
 	} else {
 		crypto_box_keypair(static_pk, static_sk);
 
-		std::experimental::filesystem::create_directories("./.marlin/keys/");
+		boost::filesystem::create_directories("./.marlin/keys/");
 		std::ofstream sk("./.marlin/keys/static", std::ios::binary);
 
 		sk.write((char *)static_sk, crypto_box_SECRETKEYBYTES);