Merge lp:~charlesk/indicator-display/lp-1452323-drop-g++-4.9-build-dep into lp:indicator-display/15.10

[Charles Kerr]

drop build-dependency on g++-4.9

drop build-dependency on g++-4.9

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/indicator-display-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-display-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-display-wily-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-display-wily-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-display-ci/18/rebuild

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

Happrove!

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-09-08 19:22:49 +0000
+++ debian/control	2015-07-15 18:46:39 +0000
@@ -4,8 +4,6 @@
 Maintainer: Charles Kerr <[e-mail]>
 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

=== modified file 'debian/rules'
--- debian/rules	2014-08-20 01:25:55 +0000
+++ debian/rules	2015-07-15 18:46:39 +0000
@@ -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
 

=== modified file 'src/exporter.cpp'
--- src/exporter.cpp	2014-10-06 20:57:13 +0000
+++ src/exporter.cpp	2015-07-15 18:46:39 +0000
@@ -23,7 +23,7 @@
 {
 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());