drop build-dependency on g++-4.9 Fixes: #1452323

Approved by: Pete Woods, PS Jenkins bot, Rodney Dawes

3 files changed, 1 insertions, 8 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 <charles.kerr@canonical.com>
 Build-Depends: cmake,
                dbus,
-#  make g++ version explicit for ABI safety <https://wiki.ubuntu.com/cpp-11>
-               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. <https://wiki.ubuntu.com/cpp-11>
-export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
-export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
-
 %:
 	dh $@ --with translations
 
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>& indicator):
+  explicit Impl(const std::shared_ptr<Indicator>& indicator):
     m_indicator(indicator)
   {
     auto bus_name = g_strdup_printf("com.canonical.indicator.%s", indicator->name());