From ab48c81a5a73cc1065f247bc26fa0b565c6565ef Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 15 Jul 2015 13:39:00 -0500 Subject: drop build-dependency on g++-4.9 --- debian/control | 2 -- debian/rules | 5 ----- 2 files changed, 7 deletions(-) diff --git a/debian/control b/debian/control index 87624ba..4f05f74 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,6 @@ Priority: optional Maintainer: Charles Kerr Build-Depends: cmake, dbus, -# make g++ version explicit for ABI safety - g++-4.9, libglib2.0-dev (>= 2.36), libproperties-cpp-dev, # for coverage reports diff --git a/debian/rules b/debian/rules index e39944a..c329b0a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,5 @@ #!/usr/bin/make -f -# Explicitly selecting a G{CC,++}-version here to avoid ABI breaks -# introduced by toolchain updates. -export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9 -export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9 - %: dh $@ --with translations -- cgit v1.2.3 From 83abb126052cc69e43804fb71222a93c80d0b3d3 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 15 Jul 2015 13:40:41 -0500 Subject: fix explicit ctor warning from cppcheck to get tests passing --- src/exporter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/exporter.cpp b/src/exporter.cpp index 21e8af7..252bbdf 100644 --- a/src/exporter.cpp +++ b/src/exporter.cpp @@ -23,7 +23,7 @@ class Exporter::Impl { public: - Impl(const std::shared_ptr& indicator): + explicit Impl(const std::shared_ptr& indicator): m_indicator(indicator) { auto bus_name = g_strdup_printf("com.canonical.indicator.%s", indicator->name()); -- cgit v1.2.3