From 074e00af268d2aafcecb08c9c5cc2776f650eeda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Madon?= <mael.madon@irit.fr>
Date: Wed, 5 Jun 2024 09:22:01 +0200
Subject: [PATCH] fix: compile warnings boost cpp >14 and zmq send and recv
---
meson.build | 2 +-
src/network.cpp | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index 89bd910..082eba1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project('batmen', 'cpp',
version: '1.0',
license: 'LGPLv3',
- default_options: ['cpp_std=c++11'],
+ default_options: ['cpp_std=c++14'],
meson_version: '>=0.40.0'
)
diff --git a/src/network.cpp b/src/network.cpp
index 8d43f73..0ad5656 100644
--- a/src/network.cpp
+++ b/src/network.cpp
@@ -32,17 +32,13 @@ void Network::bind(const std::string &socket_endpoint)
void Network::write(const string &content)
{
- // Let's make sure the sent message is in UTF-8
- string msg_utf8 = boost::locale::conv::to_utf<char>(content, "UTF-8");
-
- LOG_F(INFO, "Sending '%s'", msg_utf8.c_str());
- _socket->send(msg_utf8.data(), msg_utf8.size());
+ _socket->send(zmq::buffer(content), zmq::send_flags::none);
}
void Network::read(string &received_content)
{
zmq::message_t message;
- _socket->recv(&message);
+ _socket->recv(message, zmq::recv_flags::none);
received_content = string((char*)message.data(), message.size());
--
GitLab