From 9bcebb5cf8005f1270e23fe5b5deb5c09f950240 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Thu, 2 Sep 2021 23:36:43 +0300 Subject: [PATCH] build: avoid some compiler warnings --- lib/mu-contacts.cc | 2 +- mu/test-mu-query.cc | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/lib/mu-contacts.cc b/lib/mu-contacts.cc index 6efe9673..c027af83 100644 --- a/lib/mu-contacts.cc +++ b/lib/mu-contacts.cc @@ -241,7 +241,7 @@ Contacts::add (ContactInfo&& ci) ci_existing.last_seen = ci.last_seen; } - return ci; + return std::move(ci); } } diff --git a/mu/test-mu-query.cc b/mu/test-mu-query.cc index dd0c72f5..14337d8c 100644 --- a/mu/test-mu-query.cc +++ b/mu/test-mu-query.cc @@ -584,23 +584,13 @@ test_mu_query_tags_02 (void) /* Tests for https://github.com/djcb/mu/issues/380 - On certain platforms, something goes wrong during compilation and - the --related option doesn't work. - - + On certain platforms, something goes wrong during compilation and the + --related option doesn't work. */ static void test_mu_query_threads_compilation_error (void) { const auto xpath = make_database (MU_TESTMAILDIR); - g_assert_false (xpath.empty()); - -#ifndef __linux__ - // seems this test fails on MacOS sometimes... cannot investigate right now. -#warning investigate failing test - g_test_skip("skip test that fails on MacOS"); - return; -#endif g_assert_cmpuint (run_and_count_matches (xpath, "msgid:uwsireh25.fsf@one.dot.net"),