diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-02-16 11:41:48 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-02-16 11:41:48 +0100 |
| commit | ba692f8e3b90bccc345e241feb3378402ae7ef5d (patch) | |
| tree | d99cbed11c392778406fe64c7c8cc1e7f7959507 | |
| parent | adb447d7067f73db4040ad3119a2a52cd08879a2 (diff) | |
| parent | 20dbe77b8382c53650dffa0bf78a71c43d848d5d (diff) | |
| download | ayatana-indicator-datetime-ba692f8e3b90bccc345e241feb3378402ae7ef5d.tar.gz ayatana-indicator-datetime-ba692f8e3b90bccc345e241feb3378402ae7ef5d.tar.bz2 ayatana-indicator-datetime-ba692f8e3b90bccc345e241feb3378402ae7ef5d.zip | |
Merge branch 'tari01-pr/build-with-werror'
Attributes GH PR #88: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/88
| -rw-r--r-- | .build.yml | 6 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | include/datetime/timezone-geoclue.h | 4 | ||||
| -rw-r--r-- | src/wakeup-timer-powerd.cpp | 4 |
4 files changed, 9 insertions, 7 deletions
@@ -231,11 +231,11 @@ build_scripts: - - if [ -e ./CMakeLists.txt ]; then - if [ ${DISTRO_NAME} == "debian" ]; then - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON -DENABLE_LOMIRI_FEATURES=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -DENABLE_TESTS=ON -DENABLE_LOMIRI_FEATURES=ON - elif [ ${DISTRO_NAME} == "ubuntu" ]; then - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -DENABLE_TESTS=ON - else - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON - fi - else - exit 1 diff --git a/CMakeLists.txt b/CMakeLists.txt index ba6ebfa..6daef80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,8 @@ else() add_definitions("-Wall") endif() +add_definitions("-Wno-sign-compare") # Needed for GTest on Ubuntu + ## ## GNU standard installation directories ## diff --git a/include/datetime/timezone-geoclue.h b/include/datetime/timezone-geoclue.h index 18fc159..d25d3e5 100644 --- a/include/datetime/timezone-geoclue.h +++ b/include/datetime/timezone-geoclue.h @@ -1,5 +1,6 @@ /* * Copyright 2013 Canonical Ltd. + * Copyright 2022 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr <charles.kerr@canonical.com> + * Robert Tari <robert@tari.in> */ #ifndef INDICATOR_DATETIME_GEOCLUE_TIMEZONE_H @@ -36,7 +38,7 @@ public: ~GeoclueTimezone(); private: - struct Impl; + class Impl; std::unique_ptr<Impl> impl; // we've got pointers in here, so don't allow copying diff --git a/src/wakeup-timer-powerd.cpp b/src/wakeup-timer-powerd.cpp index f775999..77893c8 100644 --- a/src/wakeup-timer-powerd.cpp +++ b/src/wakeup-timer-powerd.cpp @@ -1,6 +1,6 @@ /* * Copyright 2014 Canonical Ltd. - * Copyright 2021 Robert Tari + * Copyright 2021-2022 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -41,7 +41,6 @@ class PowerdWakeupTimer::Impl public: explicit Impl(const std::shared_ptr<Clock>& clock): - m_clock(clock), m_cancellable(g_cancellable_new()) { g_bus_get(G_BUS_TYPE_SYSTEM, m_cancellable, on_bus_ready, this); @@ -271,7 +270,6 @@ private: ***/ core::Signal<> m_timeout; - const std::shared_ptr<Clock>& m_clock; DateTime m_wakeup_time; std::shared_ptr<GDBusConnection> m_bus; |