From fa905a741fca3bee255b32b09e9e63bd09270560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Sat, 2 May 2020 21:15:28 +0200 Subject: Fix a compile error with gcc 10 Fix #3431 --- src/network/dns_handler.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/network/dns_handler.cpp b/src/network/dns_handler.cpp index 7f0c96a..dd6f201 100644 --- a/src/network/dns_handler.cpp +++ b/src/network/dns_handler.cpp @@ -9,6 +9,7 @@ #include #include +#include #include class Resolver; -- cgit v1.2.3 From c671da13b38dcc15d0a441b1b9c258cb12966fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Sat, 2 May 2020 20:55:11 +0200 Subject: Fix a std::move() warning with clang --- src/utils/empty_if_fixed_server.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/empty_if_fixed_server.hpp b/src/utils/empty_if_fixed_server.hpp index 9ccf5fd..cbb9cea 100644 --- a/src/utils/empty_if_fixed_server.hpp +++ b/src/utils/empty_if_fixed_server.hpp @@ -11,7 +11,7 @@ namespace utils { if (!Config::get("fixed_irc_server", "").empty()) return {}; - return str; + return std::move(str); } inline std::string empty_if_fixed_server(const std::string& str) -- cgit v1.2.3 From f76cd93aff1610c9b4c720a73f6d585e8008dfd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Mon, 4 May 2020 23:55:39 +0200 Subject: =?UTF-8?q?Fix=20clang=20warnings=20on=20some=20utils=20function.?= =?UTF-8?q?=20It=E2=80=99s=20also=20faster?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/empty_if_fixed_server.hpp | 12 +++--------- src/utils/get_first_non_empty.hpp | 4 ++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/utils/empty_if_fixed_server.hpp b/src/utils/empty_if_fixed_server.hpp index cbb9cea..2422ee4 100644 --- a/src/utils/empty_if_fixed_server.hpp +++ b/src/utils/empty_if_fixed_server.hpp @@ -7,17 +7,11 @@ namespace utils { - inline std::string empty_if_fixed_server(std::string&& str) + inline const std::string& empty_if_fixed_server(const std::string& str) { + static const std::string empty{}; if (!Config::get("fixed_irc_server", "").empty()) - return {}; - return std::move(str); - } - - inline std::string empty_if_fixed_server(const std::string& str) - { - if (!Config::get("fixed_irc_server", "").empty()) - return {}; + return empty; return str; } diff --git a/src/utils/get_first_non_empty.hpp b/src/utils/get_first_non_empty.hpp index a38f5fb..2e1828d 100644 --- a/src/utils/get_first_non_empty.hpp +++ b/src/utils/get_first_non_empty.hpp @@ -6,13 +6,13 @@ bool is_empty(const std::string& val); bool is_empty(const int& val); template -T get_first_non_empty(T&& last) +T& get_first_non_empty(T&& last) { return last; } template -T get_first_non_empty(T&& first, Args&&... args) +T& get_first_non_empty(T&& first, Args&&... args) { if (!is_empty(first)) return first; -- cgit v1.2.3 From 25530cf9eeb7863ad1745a2d518fdddb1ffa1491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Tue, 5 May 2020 21:09:38 +0200 Subject: e2e: Switch from coroutines to async, for python3.8 --- tests/end_to_end/__main__.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py index a029bea..b5d56fc 100644 --- a/tests/end_to_end/__main__.py +++ b/tests/end_to_end/__main__.py @@ -108,10 +108,10 @@ class XMPPComponent(slixmpp.BaseXMPP): if self.biboumi: self.biboumi.stop() - @asyncio.coroutine - def accept_routine(self): - self.accepting_server = yield from self.loop.create_server(lambda: self, - "127.0.0.1", 8811, reuse_address=True) + + async def accept_routine(self): + self.accepting_server = await self.loop.create_server(lambda: self, + "127.0.0.1", 8811, reuse_address=True) def check_stanza_against_all_expected_xpaths(self): pass @@ -220,13 +220,11 @@ class ProcessRunner: self.signal_sent = False self.create = None - @asyncio.coroutine - def start(self): - self.process = yield from self.create + async def start(self): + self.process = await self.create - @asyncio.coroutine - def wait(self): - code = yield from self.process.wait() + async def wait(self): + code = await self.process.wait() return code def stop(self): -- cgit v1.2.3 From 23c96accf7515181218cf949b9d019615d02e7ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Sat, 9 May 2020 14:44:00 +0200 Subject: Release version 8.5 --- CHANGELOG.rst | 5 +++++ CMakeLists.txt | 2 +- packaging/biboumi.spec.cmake | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 22a65d9..35a7737 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,8 @@ +Version 8.5 - 2020-05-09 +======================== + +- Fix a build failure with GCC 10 + Version 8.4 - 2020-02-25 ======================== diff --git a/CMakeLists.txt b/CMakeLists.txt index b3c5d99..debdf06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project(biboumi) set(${PROJECT_NAME}_VERSION_MAJOR 8) -set(${PROJECT_NAME}_VERSION_MINOR 4) +set(${PROJECT_NAME}_VERSION_MINOR 5) set(${PROJECT_NAME}_VERSION_SUFFIX "") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake index 0c2a69b..45f9376 100644 --- a/packaging/biboumi.spec.cmake +++ b/packaging/biboumi.spec.cmake @@ -63,6 +63,9 @@ make check %{?_smp_mflags} %changelog +* Sat May 9 2020 Le Coz Florent - 8.5-1 + Update to version 8.5 + * Tue Feb 25 2020 Le Coz Florent - 8.4-1 Update to version 8.4 -- cgit v1.2.3