Merge lp:~michihenning/unity-scopes-api/gtest-fixes into lp:unity-scopes-api/devel

[Michi Henning]

Changed tests to use cmake-extras for gtest/gmock 1.8.
Fixed tons of warnings caused by new gtest for private ctors.
Fixed tons of warnings about signed/unsigned comparison.
Fixed segfault in the Utils test.
Fixed test failure in the SettingsDB test.
Fixed lots of places where gtest macros had their arguments in the wrong order.
Added missing dependency for language-pack-tr to control.in.
Replaced debian/control with a minimal dummy so people don't endlessly edit the wrong file (control instead of control.in) by mistake.

Changed tests to use cmake-extras for gtest/gmock 1.8.
Fixed tons of warnings caused by new gtest for private ctors.
Fixed tons of warnings about signed/unsigned comparison.
Fixed segfault in the Utils test.
Fixed test failure in the SettingsDB test.
Fixed lots of places where gtest macros had their arguments in the wrong order.
Added missing dependency for language-pack-tr to control.in.
Replaced debian/control with a minimal dummy so people don't endlessly edit the wrong file (control instead of control.in) by mistake.

[Michi Henning (michihenning)]

I set this to "work in progress" because we need to wait for the cmake-extras changes to land before this will pass its tests.

[Michi Henning (michihenning)]

I've upgraded the chroots on the slaves, so zesty builds should work with gtest 1.8 now.

[lp:~michihenning/unity-scopes-api/gtest-fixes]

694. By Michi Henning on 2016-11-25

Added missing dependency on language-pack-tr to control.in.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:693
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/53/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1175/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1182
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/968/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/968/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/968/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/968/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/968/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/968/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/53/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:694
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/54/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1178/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1185
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/971/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/971/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/971/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/971/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/971/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/971/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/54/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:694
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/55/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1179/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1186
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/972/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/972/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/972/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/972/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/972/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/972/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/55/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michihenning/unity-scopes-api/gtest-fixes]

695. By Michi Henning on 2016-11-26

Merged devel.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:695
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/56/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1180/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1187
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/973/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/973/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/973/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/973/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/973/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/973/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/56/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michihenning/unity-scopes-api/gtest-fixes]

696. By Michi Henning on 2016-11-28

Addedd missing cmake-extras to control.in.

697. By Michi Henning on 2016-11-28

Replaced debian/control with a minimully dummy, so people don't
endlessly edit control instead of control.in by mistake.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:696
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/60/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1184/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1191
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/977
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/977/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/977
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/977/artifact/output/*zip*/output.zip
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/977/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/977/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/977
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/977/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/977
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/977/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/60/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michihenning/unity-scopes-api/gtest-fixes]

698. By Michi Henning on 2016-11-28

Updated HACKING.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:697
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/61/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1185
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1192
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/978
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/978
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/978
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/978
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/978
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/978
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/978/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/61/rebuild

review: Approve (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:698
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/62/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1186
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1193
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/979
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/979/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/979
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/979/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/979
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/979/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/979
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/979/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/979
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/979/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/979
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/979/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/62/rebuild

review: Approve (continuous-integration)

[lp:~michihenning/unity-scopes-api/gtest-fixes]

699. By Michi Henning on 2016-11-28

Relaxed cmake-extras version requirement. 0.4 is good enough.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:699
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/63/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1187
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1194
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/980
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/980
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/980
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/980
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/980
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/980
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/980/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/63/rebuild

review: Approve (continuous-integration)

[lp:~michihenning/unity-scopes-api/gtest-fixes]

700. By Michi Henning on 2016-11-28

Unset LC_ALL after test if it wasn't set initially.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:700
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/64/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1192
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1199
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/985
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/985/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/985
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/985/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/985
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/985/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/985
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/985/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/985
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/985/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/985
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/985/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/64/rebuild

review: Approve (continuous-integration)

[lp:~michihenning/unity-scopes-api/gtest-fixes]

701. By Michi Henning on 2016-11-28

Fix typo.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:701
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/65/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1194
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1201
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/987
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/987/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/987
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/987/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/987
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/987/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/987
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/987/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/987
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/987/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/987
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/987/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/65/rebuild

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Looks good Michi, thanks!

P.S. On the topic of whether cppcheck finds anything the compiler doesn't, here's the sort of stuff cppcheck complains about for this project: http://pastebin.ubuntu.com/23552147/ (nothing serious really, but different nonetheless)

review: Approve

[Michi Henning (michihenning)]

Thanks for that. Interesting. Last time I ran cppcheck (quite some time ago), we didn't get any of that (or we certainly didn't get most of it). Looks like cppcheck is more thorough now. Might run it over some of our other stuff then, too.

=== modified file 'HACKING'
--- HACKING	2016-09-09 06:57:47 +0000
+++ HACKING	2016-11-28 10:48:16 +0000
@@ -205,13 +205,13 @@
 
   - QT-VERSION
 
-    The full version number parts for libunity-scopes-qt.
+    The full version number for libunity-scopes-qt.
 
   - *If* the soname changes, you need to add the outdated
     versions to the "Replaces:" and "Conflicts:" entries
-    in control and control.in. (You need an extra
-    entry for each Vivid and Wily/Xenial andlater. See
-    bileto_pre_release_hook for the sed scripts that append a
+    in control.in. (You need an extra entry for each Vivid and
+    Wily/Xenial and later.)
+    See bileto_pre_release_hook for the sed scripts that append a
     line to the stanza if the soname is changed. This also may apply
     if the soname of the Qt library changes, in which case
     bileto_pre_release_hook needs a corresponding update.
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-09-21 03:51:32 +0000
+++ debian/changelog	2016-11-28 10:48:16 +0000
@@ -1,3 +1,9 @@
+unity-scopes-api (1.0.7+17.04.20161115-0ubuntu1) zesty; urgency=medium
+
+  * Be stricter on user-configurable idle timeout (1s to 5min).
+
+ -- Marcus Tomlinson <[e-mail]>  Tue, 15 Nov 2016 06:09:04 +0000
+
 unity-scopes-api (1.0.7+16.10.20160921-0ubuntu1) yakkety; urgency=medium
 
   [ Marcus Tomlinson ]
 
=== modified file 'debian/control'
--- debian/control	2016-10-07 15:42:53 +0000
+++ debian/control	2016-11-28 10:48:16 +0000
@@ -4,124 +4,10 @@
 # This file is regenerated automatically by bileto.
 #
 Source: unity-scopes-api
-Priority: optional
-Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: abigail-tools <!nocheck> | libabigail-tools <!nocheck>,
-               binutils:native,
-               capnproto,
-               click-dev (>= 0.2.2),
-               cmake,
-               dbus-test-runner,
-               debhelper (>= 9),
-               devscripts,
-               doxygen,
-               exuberant-ctags,
-               google-mock,
-               graphviz,
-               language-pack-tr,
-               libaccounts-glib-dev,
-               libapparmor-dev,
-               libboost-filesystem-dev,
-               libboost-regex-dev,
-               libboost-serialization-dev,
-               libboost-thread-dev,
-               libcapnp-dev (>= 0.4.0),
-               libdbustest1-dev,
-               libjson-glib-dev,
-               liblttng-ust-dev,
-               libnet-cpp-dev (>= 1.2.0),
-               libprocess-cpp-dev (>= 1.0.1),
-               libsignon-glib-dev,
-               libunity-api-dev (>= 7.80.7~),
-               libzmq3-dev,
-               libzmqpp-dev,
-               lsb-release,
-               lttng-tools,
-               pkg-config,
-               python3 <!nocheck>,
-               python3-dbusmock <!nocheck>,
-               python-tornado <!nocheck>,
-               valgrind,
-Standards-Version: 3.9.6
-XS-Testsuite: autopkgtest
-Section: libs
-Homepage: https://launchpad.net/unity-scopes-api
-# if you don't have have commit access to this branch but would like to upload
-# directly to Ubuntu, don't worry: your changes will be merged back into the
-# upstream branch
-Vcs-Bzr: lp:unity-scopes-api
-Vcs-Browser: https://code.launchpad.net/unity-scopes-api
+
+# DO NOT EDIT THIS FILE. WE REALLY MEAN IT!
 
 Package: libunity-scopes1.0
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Replaces: libunity-scopes0,
-          libunity-scopes3,
-          libunity-scopes1,
-          libunity-scopes2,
-Conflicts: libunity-scopes0,
-           libunity-scopes3,
-           libunity-scopes1,
-           libunity-scopes2,
-Description: API for Unity scopes integration
- Library to integrate scopes with the Unity shell
-
-Package: libunity-scopes-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: libproperties-cpp-dev,
-         libunity-api-dev,
-         libunity-scopes1.0 (= ${binary:Version}),
-         ${misc:Depends},
-Description: Header files for Unity scopes API
- Library to integrate scopes with the Unity shell (dev files)
-
-Package: libunity-scopes-cli
-Section: devel
-Architecture: any
-Multi-Arch: foreign
-Depends: libunity-scopes1.0 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: Client utility for Unity scopes API
- Commandline client utility for querying Unity scopes, useful for testing.
-
-Package: libunity-scopes-doc
-Section: doc
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends},
-Description: Documentation for Unity scopes API
- Library to integrate scopes with the Unity shell (documentation)
-
-Package: libunity-scopes-qt0.2
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Qt library for Unity scopes API
- Library that integrates classes based on Qt for convenience
-
-Package: libunity-scopes-qt-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: libunity-scopes-dev (= ${binary:Version}),
-         libunity-scopes-qt0.2 (= ${binary:Version}),
-         libnet-cpp-dev (>=1.2.0),
-         ${misc:Depends},
-Description: Header files for Qt library for Unity scopes API
- Library that integrates classes based on Qt for convenience (dev files)
-
-Package: libunity-scopes-qt-doc
-Section: doc
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends},
-Description: Documentation for Unity Qt library
- Library that integrates classes based on Qt for convenience (documentation)
+Description: DO NOT EDIT THIS FILE, IT IS GENERATED FROM control.in
+ DO NOT EDIT THIS FILE
 
=== modified file 'debian/control.in'
--- debian/control.in	2016-07-25 05:35:44 +0000
+++ debian/control.in	2016-11-28 10:48:16 +0000
@@ -6,6 +6,7 @@
                capnproto,
                click-dev (>= 0.2.2),
                cmake,
+               cmake-extras (>= 0.4),
                dbus-test-runner,
                debhelper (>= 9),
                devscripts,
@@ -13,6 +14,7 @@
                exuberant-ctags,
                google-mock,
                graphviz,
+               language-pack-tr,
                libaccounts-glib-dev,
                libapparmor-dev,
                libboost-filesystem-dev,
 
=== modified file 'include/unity/scopes/testing/MockObject.h'
--- include/unity/scopes/testing/MockObject.h	2015-04-01 11:28:32 +0000
+++ include/unity/scopes/testing/MockObject.h	2016-11-28 10:48:16 +0000
@@ -20,7 +20,10 @@
 
 #include <unity/scopes/Object.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gmock/gmock.h>
+#pragma GCC diagnostic pop
 
 namespace unity
 {
 
=== modified file 'include/unity/scopes/testing/MockPreviewReply.h'
--- include/unity/scopes/testing/MockPreviewReply.h	2015-04-10 10:10:06 +0000
+++ include/unity/scopes/testing/MockPreviewReply.h	2016-11-28 10:48:16 +0000
@@ -22,7 +22,10 @@
 
 #include <unity/scopes/testing/MockObject.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gmock/gmock.h>
+#pragma GCC diagnostic pop
 
 namespace unity
 {
 
=== modified file 'include/unity/scopes/testing/MockQueryCtrl.h'
--- include/unity/scopes/testing/MockQueryCtrl.h	2014-11-03 05:31:30 +0000
+++ include/unity/scopes/testing/MockQueryCtrl.h	2016-11-28 10:48:16 +0000
@@ -22,7 +22,10 @@
 
 #include <unity/scopes/testing/MockObject.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gmock/gmock.h>
+#pragma GCC diagnostic pop
 
 namespace unity
 {
 
=== modified file 'include/unity/scopes/testing/MockRegistry.h'
--- include/unity/scopes/testing/MockRegistry.h	2015-02-06 00:25:05 +0000
+++ include/unity/scopes/testing/MockRegistry.h	2016-11-28 10:48:16 +0000
@@ -21,7 +21,10 @@
 #include <unity/scopes/Registry.h>
 #include <unity/scopes/testing/MockObject.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gmock/gmock.h>
+#pragma GCC diagnostic pop
 
 namespace unity
 {
 
=== modified file 'include/unity/scopes/testing/MockScope.h'
--- include/unity/scopes/testing/MockScope.h	2016-09-08 08:22:37 +0000
+++ include/unity/scopes/testing/MockScope.h	2016-11-28 10:48:16 +0000
@@ -24,7 +24,10 @@
 
 #include <unity/scopes/testing/MockObject.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gmock/gmock.h>
+#pragma GCC diagnostic pop
 
 namespace unity
 {
 
=== modified file 'include/unity/scopes/testing/MockSearchReply.h'
--- include/unity/scopes/testing/MockSearchReply.h	2016-06-14 14:19:25 +0000
+++ include/unity/scopes/testing/MockSearchReply.h	2016-11-28 10:48:16 +0000
@@ -24,7 +24,10 @@
 
 #include <unity/scopes/testing/MockObject.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gmock/gmock.h>
+#pragma GCC diagnostic pop
 
 namespace unity
 {
 
=== modified file 'include/unity/scopes/testing/TypedScopeFixture.h'
--- include/unity/scopes/testing/TypedScopeFixture.h	2016-03-09 04:01:35 +0000
+++ include/unity/scopes/testing/TypedScopeFixture.h	2016-11-28 10:48:16 +0000
@@ -22,7 +22,10 @@
 
 #include <unity/scopes/testing/MockRegistry.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <memory>
 
 
=== modified file 'src/scopes/internal/Utils.cpp'
--- src/scopes/internal/Utils.cpp	2016-10-07 15:42:53 +0000
+++ src/scopes/internal/Utils.cpp	2016-11-28 10:48:16 +0000
@@ -266,7 +266,20 @@
         }
         else
         {
-            result += custom_exec_arg + " ";
+            // The path provided is already absolute. Ensure that the SNAP env var is honored.
+
+            char const* sroot = getenv("SNAP");
+            std::string snap_root;
+            if (sroot)
+            {
+                snap_root = sroot;
+                if (!snap_root.empty() && snap_root[snap_root.size() - 1] != '/')
+                {
+                    snap_root += '/';
+                }
+            }
+
+            result += snap_root + custom_exec_arg + " ";
         }
     }
     result.resize(result.size() - 1);
 
=== modified file 'test/gtest/CMakeLists.txt'
--- test/gtest/CMakeLists.txt	2014-12-02 02:00:57 +0000
+++ test/gtest/CMakeLists.txt	2016-11-28 10:48:16 +0000
@@ -1,21 +1,4 @@
-if (NOT DEFINED GMOCK_ROOT)
-    set(GMOCK_ROOT /usr/src/gmock)
-endif()
-
-add_subdirectory(${GMOCK_ROOT} gmock)
-
-# Selectively switch off warnings about missing field initializers when building gmock and gtest
-set_property(TARGET gmock APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-missing-field-initializers -Wno-old-style-cast")
-set_property(TARGET gmock_main APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-missing-field-initializers -Wno-old-style-cast")
-set_property(TARGET gtest APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-missing-field-initializers -Wno-old-style-cast")
-
-# Make sure we always build gtest/gmock with debug info, otherwise we don't
-# get line numbers for the code that is dragged in by the test macros.
-set_property(TARGET gmock APPEND_STRING PROPERTY COMPILE_FLAGS " -g")
-set_property(TARGET gmock_main APPEND_STRING PROPERTY COMPILE_FLAGS " -g")
-set_property(TARGET gtest APPEND_STRING PROPERTY COMPILE_FLAGS " -g")
-
-include_directories(${GMOCK_ROOT}/gtest/include)
+find_package(GMock)
 
 set(LIBGTEST gtest gmock gmock_main)
 set(TESTLIBS ${TESTLIBS} ${LIBGTEST} boost_regex)
 
=== modified file 'test/gtest/scopes/Activation/Activation_test.cpp'
--- test/gtest/scopes/Activation/Activation_test.cpp	2015-06-08 14:05:12 +0000
+++ test/gtest/scopes/Activation/Activation_test.cpp	2016-11-28 10:48:16 +0000
@@ -28,10 +28,14 @@
 #include <unity/scopes/ActionMetadata.h>
 #include <unity/UnityExceptions.h>
 #include <functional>
-#include <gtest/gtest.h>
 #include <unity/scopes/testing/Result.h>
 #include <TestScope.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
 
 
=== modified file 'test/gtest/scopes/ActivationResponse/ActivationResponse_test.cpp'
--- test/gtest/scopes/ActivationResponse/ActivationResponse_test.cpp	2015-07-14 15:11:48 +0000
+++ test/gtest/scopes/ActivationResponse/ActivationResponse_test.cpp	2016-11-28 10:48:16 +0000
@@ -22,7 +22,11 @@
 #include <unity/scopes/internal/ResultImpl.h>
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/UnityExceptions.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
@@ -107,7 +111,7 @@
 
         ActivationResponse resp(widgets);
         EXPECT_EQ(ActivationResponse::Status::UpdatePreview, resp.status());
-        EXPECT_EQ(1, resp.updated_widgets().size());
+        EXPECT_EQ(1u, resp.updated_widgets().size());
         EXPECT_EQ("w1", resp.updated_widgets().begin()->id());
     }
 
@@ -170,7 +174,7 @@
 
         ActivationResponse resp2 = internal::ActivationResponseImpl::create(var, runtime.get());
         EXPECT_EQ(ActivationResponse::Status::UpdatePreview, resp2.status());
-        EXPECT_EQ(1, resp2.updated_widgets().size());
+        EXPECT_EQ(1u, resp2.updated_widgets().size());
         EXPECT_EQ("w1", resp2.updated_widgets().begin()->id());
     }
 }
 
=== modified file 'test/gtest/scopes/Aggregation/ChildScopes_test.cpp'
--- test/gtest/scopes/Aggregation/ChildScopes_test.cpp	2015-12-18 09:21:53 +0000
+++ test/gtest/scopes/Aggregation/ChildScopes_test.cpp	2016-11-28 10:48:16 +0000
@@ -26,7 +26,11 @@
 
 #include <boost/filesystem/operations.hpp>
 #include <fstream>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace boost;
 using namespace testing;
@@ -152,7 +156,7 @@
 
     // 1st TestScope::find_child_scopes() returns: "A,B,C"
     ChildScopeList return_list = test_scope->child_scopes();
-    ASSERT_EQ(3, return_list.size());
+    ASSERT_EQ(3u, return_list.size());
     EXPECT_EQ("ScopeA", return_list[0].id);
     EXPECT_TRUE(return_list[0].enabled);
     EXPECT_EQ("ScopeB", return_list[1].id);
@@ -168,7 +172,7 @@
 
     // 2nd TestScope::find_child_scopes() returns: "D,A,B,C,E"
     return_list = test_scope->child_scopes();
-    ASSERT_EQ(5, return_list.size());
+    ASSERT_EQ(5u, return_list.size());
     EXPECT_EQ("ScopeD", return_list[0].id);
     EXPECT_FALSE(return_list[0].enabled);
     EXPECT_EQ("ScopeA", return_list[1].id);
@@ -182,7 +186,7 @@
 
     // 3rd+ TestScope::find_child_scopes() returns: "D,A,B"
     return_list = test_scope->child_scopes();
-    ASSERT_EQ(3, return_list.size());
+    ASSERT_EQ(3u, return_list.size());
     EXPECT_EQ("ScopeD", return_list[0].id);
     EXPECT_FALSE(return_list[0].enabled);
     EXPECT_EQ("ScopeA", return_list[1].id);
@@ -199,7 +203,7 @@
 
     // 3rd+ TestScope::find_child_scopes() returns: "D,A,B"
     return_list = test_scope->child_scopes();
-    ASSERT_EQ(3, return_list.size());
+    ASSERT_EQ(3u, return_list.size());
     EXPECT_EQ("ScopeD", return_list[0].id);
     EXPECT_TRUE(return_list[0].enabled);
     EXPECT_EQ("ScopeA", return_list[1].id);
@@ -216,7 +220,7 @@
 
     // 1st TestScope::find_child_scopes() returns: "A,B,C"
     ChildScopeList return_list = test_scope->child_scopes();
-    ASSERT_EQ(3, return_list.size());
+    ASSERT_EQ(3u, return_list.size());
     EXPECT_EQ("ScopeA", return_list[0].id);
     EXPECT_FALSE(return_list[0].enabled);
     EXPECT_EQ("ScopeB", return_list[1].id);
@@ -242,7 +246,7 @@
 
     // 1st TestScope::find_child_scopes() returns: "A,B,C"
     ChildScopeList return_list = test_scope->child_scopes();
-    ASSERT_EQ(3, return_list.size());
+    ASSERT_EQ(3u, return_list.size());
     EXPECT_EQ("ScopeA", return_list[0].id);
     EXPECT_TRUE(return_list[0].enabled);
     EXPECT_EQ("ScopeB", return_list[1].id);
@@ -263,7 +267,7 @@
 
     // 1st TestScope::find_child_scopes() returns: "A,B,C"
     ChildScopeList return_list = test_scope->child_scopes();
-    ASSERT_EQ(3, return_list.size());
+    ASSERT_EQ(3u, return_list.size());
     EXPECT_EQ("ScopeA", return_list[0].id);
     EXPECT_TRUE(return_list[0].enabled);
     EXPECT_EQ("ScopeB", return_list[1].id);
@@ -278,7 +282,7 @@
 
     // Check that nothing crashes and we simply get the list from the scope as is
     return_list = test_scope->child_scopes();
-    ASSERT_EQ(3, return_list.size());
+    ASSERT_EQ(3u, return_list.size());
     EXPECT_EQ("ScopeA", return_list[0].id);
     EXPECT_TRUE(return_list[0].enabled);
     EXPECT_EQ("ScopeB", return_list[1].id);
@@ -293,7 +297,7 @@
 
     // Check that nothing crashes and we simply get the list from the scope as is
     return_list = test_scope->child_scopes();
-    ASSERT_EQ(3, return_list.size());
+    ASSERT_EQ(3u, return_list.size());
     EXPECT_EQ("ScopeA", return_list[0].id);
     EXPECT_TRUE(return_list[0].enabled);
     EXPECT_EQ("ScopeB", return_list[1].id);
 
=== modified file 'test/gtest/scopes/Aggregation/Keywords_test.cpp'
--- test/gtest/scopes/Aggregation/Keywords_test.cpp	2015-12-18 09:21:53 +0000
+++ test/gtest/scopes/Aggregation/Keywords_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,11 @@
 #include <unity/scopes/testing/ScopeMetadataBuilder.h>
 
 #include <boost/filesystem/operations.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "AggTestScope.h"
 
@@ -157,7 +161,7 @@
 
     // Should see all scopes' results here as all children are enabled by default
     auto r = receiver->results();
-    EXPECT_EQ(4, r.size());
+    EXPECT_EQ(4u, r.size());
     EXPECT_TRUE(r.find("A") != r.end());
     EXPECT_TRUE(r.find("B") != r.end());
     EXPECT_TRUE(r.find("C") != r.end());
@@ -178,7 +182,7 @@
 
     // Should not see scope C's results here as it has been disabled
     r = receiver->results();
-    EXPECT_EQ(3, r.size());
+    EXPECT_EQ(3u, r.size());
     EXPECT_TRUE(r.find("A") != r.end());
     EXPECT_TRUE(r.find("B") != r.end());
     EXPECT_TRUE(r.find("D") != r.end());
@@ -198,7 +202,7 @@
 
     // Should not see scope C and D's results here as they are disabled
     r = receiver->results();
-    EXPECT_EQ(2, r.size());
+    EXPECT_EQ(2u, r.size());
     EXPECT_TRUE(r.find("A") != r.end());
     EXPECT_TRUE(r.find("B") != r.end());
 
@@ -217,7 +221,7 @@
 
     // Should not see scope D's results here as it is still disabled
     r = receiver->results();
-    EXPECT_EQ(3, r.size());
+    EXPECT_EQ(3u, r.size());
     EXPECT_TRUE(r.find("A") != r.end());
     EXPECT_TRUE(r.find("B") != r.end());
     EXPECT_TRUE(r.find("C") != r.end());
@@ -237,7 +241,7 @@
 
     // Should see all scopes' results here as all children are enabled again
     r = receiver->results();
-    EXPECT_EQ(4, r.size());
+    EXPECT_EQ(4u, r.size());
     EXPECT_TRUE(r.find("A") != r.end());
     EXPECT_TRUE(r.find("B") != r.end());
     EXPECT_TRUE(r.find("C") != r.end());
@@ -267,7 +271,7 @@
 
     // Should see all scopes' results here as all children are enabled by default
     auto r = receiver->results();
-    EXPECT_EQ(4, r.size());
+    EXPECT_EQ(4u, r.size());
     EXPECT_TRUE(r.find("A") != r.end());
     EXPECT_TRUE(r.find("B") != r.end());
     EXPECT_TRUE(r.find("C") != r.end());
 
=== modified file 'test/gtest/scopes/Aggregation/LoopDetection_test.cpp'
--- test/gtest/scopes/Aggregation/LoopDetection_test.cpp	2015-11-23 10:09:11 +0000
+++ test/gtest/scopes/Aggregation/LoopDetection_test.cpp	2016-11-28 10:48:16 +0000
@@ -20,7 +20,10 @@
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/SearchMetadata.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "AggTestScope.h"
 
@@ -124,7 +127,7 @@
     receiver->wait_until_finished();
 
     auto r = receiver->results();
-    EXPECT_EQ(3, r.size());
+    EXPECT_EQ(3u, r.size());
     EXPECT_TRUE(r.find("A") != r.end());
     EXPECT_TRUE(r.find("B") != r.end());
     EXPECT_TRUE(r.find("C") != r.end());
@@ -141,12 +144,12 @@
     receiver->wait_until_finished();
 
     auto r = receiver->results();
-    EXPECT_EQ(4, r.size());
+    EXPECT_EQ(4u, r.size());
     EXPECT_TRUE(r.find("A") != r.end());
     EXPECT_TRUE(r.find("B") != r.end());
     EXPECT_TRUE(r.find("C") != r.end());
     EXPECT_TRUE(r.find("D") != r.end());
-    EXPECT_EQ(2, r.find("D")->second.size());  // B, and C each forwarded to D, so there must be 2 results.
+    EXPECT_EQ(2u, r.find("D")->second.size());  // B, and C each forwarded to D, so there must be 2 results.
 }
 
 TEST_F(LoopDetectionTest, immediate_loop)
@@ -157,8 +160,8 @@
     receiver->wait_until_finished();
 
     auto r = receiver->results();
-    EXPECT_EQ(1, r.size());
-    EXPECT_EQ(3, r.find("A")->second.size());  // "A" has sent the query twice to itself, second attempt stops loop
+    EXPECT_EQ(1u, r.size());
+    EXPECT_EQ(3u, r.find("A")->second.size());  // "A" has sent the query twice to itself, second attempt stops loop
 }
 
 TEST_F(LoopDetectionTest, intermediate_loop)
@@ -171,10 +174,10 @@
     receiver->wait_until_finished();
 
     auto r = receiver->results();
-    EXPECT_EQ(3, r.size());
-    EXPECT_EQ(2, r.find("A")->second.size());  // "A" got results from B and C
-    EXPECT_EQ(2, r.find("B")->second.size());  // "B" got results from C and A
-    EXPECT_EQ(1, r.find("C")->second.size());  // "C" got result from A
+    EXPECT_EQ(3u, r.size());
+    EXPECT_EQ(2u, r.find("A")->second.size());  // "A" got results from B and C
+    EXPECT_EQ(2u, r.find("B")->second.size());  // "B" got results from C and A
+    EXPECT_EQ(1u, r.find("C")->second.size());  // "C" got result from A
 }
 
 TEST_F(LoopDetectionTest, repeated_search_on_leaf)
@@ -188,11 +191,11 @@
     receiver->wait_until_finished();
 
     auto r = receiver->results();
-    EXPECT_EQ(4, r.size());
-    EXPECT_EQ(1, r.find("A")->second.size());
-    EXPECT_EQ(1, r.find("B")->second.size());
-    EXPECT_EQ(1, r.find("C")->second.size());
-    EXPECT_EQ(3, r.find("D")->second.size());
+    EXPECT_EQ(4u, r.size());
+    EXPECT_EQ(1u, r.find("A")->second.size());
+    EXPECT_EQ(1u, r.find("B")->second.size());
+    EXPECT_EQ(1u, r.find("C")->second.size());
+    EXPECT_EQ(3u, r.find("D")->second.size());
 }
 
 TEST_F(LoopDetectionTest, repeated_search_on_aggregator)
@@ -206,10 +209,10 @@
     receiver->wait_until_finished();
 
     auto r = receiver->results();
-    EXPECT_EQ(3, r.size());
-    EXPECT_EQ(1, r.find("A")->second.size());
-    EXPECT_EQ(1, r.find("B")->second.size());
-    EXPECT_EQ(1, r.find("C")->second.size());
+    EXPECT_EQ(3u, r.size());
+    EXPECT_EQ(1u, r.find("A")->second.size());
+    EXPECT_EQ(1u, r.find("B")->second.size());
+    EXPECT_EQ(1u, r.find("C")->second.size());
 }
 
 #pragma GCC diagnostic pop
 
=== modified file 'test/gtest/scopes/Annotation/Annotation_test.cpp'
--- test/gtest/scopes/Annotation/Annotation_test.cpp	2014-11-18 07:04:04 +0000
+++ test/gtest/scopes/Annotation/Annotation_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,11 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <unity/scopes/Annotation.h>
 #include <unity/scopes/CannedQuery.h>
 #include <unity/scopes/internal/CannedQueryImpl.h>
 
=== modified file 'test/gtest/scopes/CannedQuery/CannedQuery_test.cpp'
--- test/gtest/scopes/CannedQuery/CannedQuery_test.cpp	2015-02-27 09:43:40 +0000
+++ test/gtest/scopes/CannedQuery/CannedQuery_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,11 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <unity/scopes/CannedQuery.h>
 #include <unity/scopes/internal/CannedQueryImpl.h>
 #include <unity/scopes/OptionSelectorFilter.h>
@@ -278,7 +282,7 @@
         filter->add_option("o1", "Option 1");
         filter->add_option("o2", "Option 2");
         auto actopts = filter->active_options(fstate);
-        EXPECT_EQ(1, actopts.size());
+        EXPECT_EQ(1u, actopts.size());
         EXPECT_EQ("o1", (*(actopts.begin()))->id());
     }
     {
 
=== modified file 'test/gtest/scopes/CategorisedResult/CategorisedResult_test.cpp'
--- test/gtest/scopes/CategorisedResult/CategorisedResult_test.cpp	2015-07-15 15:49:05 +0000
+++ test/gtest/scopes/CategorisedResult/CategorisedResult_test.cpp	2016-11-28 10:48:16 +0000
@@ -23,7 +23,11 @@
 #include <unity/scopes/internal/ReplyObject.h>
 #include <unity/scopes/internal/CategorisedResultImpl.h>
 #include <unity/UnityExceptions.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
 
=== modified file 'test/gtest/scopes/Category/Category_test.cpp'
--- test/gtest/scopes/Category/Category_test.cpp	2014-07-02 09:36:34 +0000
+++ test/gtest/scopes/Category/Category_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,10 @@
 #include <unity/UnityExceptions.h>
 #include <unity/scopes/Variant.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity;
 
=== modified file 'test/gtest/scopes/CategoryRenderer/CategoryRenderer_test.cpp'
--- test/gtest/scopes/CategoryRenderer/CategoryRenderer_test.cpp	2014-07-07 23:53:36 +0000
+++ test/gtest/scopes/CategoryRenderer/CategoryRenderer_test.cpp	2016-11-28 10:48:16 +0000
@@ -19,7 +19,11 @@
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/UnityExceptions.h>
 #include <fstream>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
 
=== modified file 'test/gtest/scopes/ColumnLayout/ColumnLayout_test.cpp'
--- test/gtest/scopes/ColumnLayout/ColumnLayout_test.cpp	2014-02-25 12:08:41 +0000
+++ test/gtest/scopes/ColumnLayout/ColumnLayout_test.cpp	2016-11-28 10:48:16 +0000
@@ -19,7 +19,11 @@
 #include <unity/scopes/ColumnLayout.h>
 #include <unity/scopes/internal/ColumnLayoutImpl.h>
 #include <unity/UnityExceptions.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
 
=== modified file 'test/gtest/scopes/DateTimePickerFilter/DateTimePickerFilter_test.cpp'
--- test/gtest/scopes/DateTimePickerFilter/DateTimePickerFilter_test.cpp	2015-11-12 12:45:41 +0000
+++ test/gtest/scopes/DateTimePickerFilter/DateTimePickerFilter_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,11 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <unity/scopes/FilterState.h>
 #include <unity/scopes/DateTimePickerFilter.h>
 #include <unity/scopes/internal/DateTimePickerFilterImpl.h>
 
=== modified file 'test/gtest/scopes/Department/Department_test.cpp'
--- test/gtest/scopes/Department/Department_test.cpp	2014-05-28 13:52:22 +0000
+++ test/gtest/scopes/Department/Department_test.cpp	2016-11-28 10:48:16 +0000
@@ -20,7 +20,11 @@
 #include <unity/scopes/internal/DepartmentImpl.h>
 #include <unity/scopes/CannedQuery.h>
 #include <unity/UnityExceptions.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
 
=== modified file 'test/gtest/scopes/Filters/Filters_test.cpp'
--- test/gtest/scopes/Filters/Filters_test.cpp	2016-06-14 14:54:15 +0000
+++ test/gtest/scopes/Filters/Filters_test.cpp	2016-11-28 10:48:16 +0000
@@ -31,8 +31,12 @@
 #include <unity/scopes/ValueSliderLabels.h>
 #include <unity/scopes/SearchMetadata.h>
 #include <unity/UnityExceptions.h>
+#include <TestScope.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
-#include <TestScope.h>
+#pragma GCC diagnostic pop
 
 using namespace unity::scopes;
 using namespace unity::scopes::experimental;
 
=== modified file 'test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp'
--- test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp	2015-01-09 03:16:51 +0000
+++ test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,11 @@
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/internal/ScopeImpl.h>
 
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "SlowSearchScope.h"
 
 
=== modified file 'test/gtest/scopes/Invocation/Invocation_test.cpp'
--- test/gtest/scopes/Invocation/Invocation_test.cpp	2015-01-09 03:16:51 +0000
+++ test/gtest/scopes/Invocation/Invocation_test.cpp	2016-11-28 10:48:16 +0000
@@ -30,7 +30,10 @@
 
 #include <boost/regex.hpp>  // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "EmptyScope.h"
 #include "TestScope.h"
 
=== modified file 'test/gtest/scopes/Location/Location_test.cpp'
--- test/gtest/scopes/Location/Location_test.cpp	2015-03-06 07:56:37 +0000
+++ test/gtest/scopes/Location/Location_test.cpp	2016-11-28 10:48:16 +0000
@@ -18,8 +18,12 @@
 
 #include <unity/scopes/ScopeExceptions.h>
 #include <unity/scopes/Location.h>
+#include <unity/UnityExceptions.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
-#include <unity/UnityExceptions.h>
+#pragma GCC diagnostic pop
 
 using namespace unity;
 using namespace unity::scopes;
 
=== modified file 'test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp'
--- test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp	2016-03-16 09:52:22 +0000
+++ test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp	2016-11-28 10:48:16 +0000
@@ -28,11 +28,15 @@
 #include <boost/filesystem/operations.hpp>
 #include <condition_variable>
 #include <functional>
-#include <gtest/gtest.h>
 #include <libaccounts-glib/accounts-glib.h>
 #include <libdbustest/dbus-test.h>
 #include <thread>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 using namespace unity;
 using namespace unity::scopes;
 using namespace unity::scopes::testing;
@@ -421,13 +425,13 @@
 TEST_F(OnlineAccountClientTest, refresh_services_main_loop)
 {
     auto statuses = oa_client()->get_service_statuses();
-    EXPECT_EQ(0, statuses.size());
+    EXPECT_EQ(0u, statuses.size());
 
     create_account();
     oa_client()->refresh_service_statuses();
 
     statuses = oa_client()->get_service_statuses();
-    EXPECT_EQ(1, statuses.size());
+    EXPECT_EQ(1u, statuses.size());
     EXPECT_FALSE(statuses[0].service_enabled);
 
     enable_service();
@@ -464,7 +468,7 @@
     oa_client()->refresh_service_statuses();
 
     statuses = oa_client()->get_service_statuses();
-    EXPECT_EQ(0, statuses.size());
+    EXPECT_EQ(0u, statuses.size());
 }
 
 TEST_F(OnlineAccountClientTest, service_update_callback)
 
=== modified file 'test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp'
--- test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp	2016-03-09 12:06:02 +0000
+++ test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,12 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <unity/scopes/FilterState.h>
 #include <unity/scopes/OptionSelectorFilter.h>
 #include <unity/scopes/internal/OptionSelectorFilterImpl.h>
 
=== modified file 'test/gtest/scopes/PreviewWidget/PreviewWidget_test.cpp'
--- test/gtest/scopes/PreviewWidget/PreviewWidget_test.cpp	2014-08-29 14:11:24 +0000
+++ test/gtest/scopes/PreviewWidget/PreviewWidget_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,11 @@
 #include <unity/UnityExceptions.h>
 #include <unity/scopes/Variant.h>
 #include <unity/scopes/internal/JsonCppNode.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
 
=== modified file 'test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp'
--- test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp	2015-10-29 06:24:06 +0000
+++ test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,8 +21,12 @@
 #include <unity/scopes/ActionMetadata.h>
 #include <unity/scopes/internal/ActionMetadataImpl.h>
 #include <unity/scopes/internal/SearchMetadataImpl.h>
+#include <unity/UnityExceptions.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
-#include <unity/UnityExceptions.h>
+#pragma GCC diagnostic pop
 
 using namespace unity;
 using namespace unity::scopes;
 
=== modified file 'test/gtest/scopes/RadioButtonsFilter/RadioButtonsFilter_test.cpp'
--- test/gtest/scopes/RadioButtonsFilter/RadioButtonsFilter_test.cpp	2015-11-12 12:45:41 +0000
+++ test/gtest/scopes/RadioButtonsFilter/RadioButtonsFilter_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,11 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <unity/scopes/FilterState.h>
 #include <unity/scopes/RadioButtonsFilter.h>
 #include <unity/UnityExceptions.h>
 
=== modified file 'test/gtest/scopes/RangeInputFilter/RangeInputFilter_test.cpp'
--- test/gtest/scopes/RangeInputFilter/RangeInputFilter_test.cpp	2016-03-09 11:33:52 +0000
+++ test/gtest/scopes/RangeInputFilter/RangeInputFilter_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,11 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <cmath>
 #include <unity/scopes/FilterState.h>
 #include <unity/scopes/RangeInputFilter.h>
 
=== modified file 'test/gtest/scopes/RatingFilter/RatingFilter_test.cpp'
--- test/gtest/scopes/RatingFilter/RatingFilter_test.cpp	2014-06-17 10:30:03 +0000
+++ test/gtest/scopes/RatingFilter/RatingFilter_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,12 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <unity/scopes/FilterState.h>
 #include <unity/scopes/RatingFilter.h>
 #include <unity/UnityExceptions.h>
 
=== modified file 'test/gtest/scopes/Registry/Registry_test.cpp'
--- test/gtest/scopes/Registry/Registry_test.cpp	2016-03-31 09:27:33 +0000
+++ test/gtest/scopes/Registry/Registry_test.cpp	2016-11-28 10:48:16 +0000
@@ -24,7 +24,11 @@
 #include <unity/scopes/SearchMetadata.h>
 
 #include <boost/filesystem/operations.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <chrono>
 #include <condition_variable>
@@ -96,7 +100,7 @@
     EXPECT_EQ("scope-A.SearchHint", meta.search_hint());
     EXPECT_EQ(TEST_RUNTIME_PATH "/scopes/testscopeA", meta.scope_directory());
     auto defs = meta.settings_definitions();
-    ASSERT_EQ(2, defs.size());
+    ASSERT_EQ(2u, defs.size());
     EXPECT_EQ("locationSetting", defs[0].get_dict()["id"].get_string());
     EXPECT_EQ("Location", defs[0].get_dict()["displayName"].get_string());
     EXPECT_EQ("string", defs[0].get_dict()["type"].get_string());
@@ -144,10 +148,10 @@
     EXPECT_EQ("scope-B.SearchHint", meta.search_hint());
     EXPECT_EQ(TEST_RUNTIME_PATH "/scopes/testscopeB", meta.scope_directory());
     defs = meta.settings_definitions();
-    EXPECT_EQ(0, defs.size());
+    EXPECT_EQ(0u, defs.size());
     EXPECT_FALSE(meta.location_data_needed());
-    EXPECT_EQ(0, meta.child_scope_ids().size());
-    EXPECT_EQ(0, meta.keywords().size());
+    EXPECT_EQ(0u, meta.child_scope_ids().size());
+    EXPECT_EQ(0u, meta.keywords().size());
     EXPECT_EQ(0, meta.version());
     EXPECT_FALSE(meta.is_aggregator());
 }
@@ -211,7 +215,7 @@
 
     auto meta = r->get_metadata("testscopeA");
     auto defs = meta.settings_definitions();
-    EXPECT_EQ(2, defs.size());
+    EXPECT_EQ(2u, defs.size());
     auto sp = meta.proxy();
 
     // testscopeA should not be running at this point
@@ -228,7 +232,7 @@
 
     meta = r->get_metadata("testscopeB");
     defs = meta.settings_definitions();
-    EXPECT_EQ(0, defs.size());
+    EXPECT_EQ(0u, defs.size());
     sp = meta.proxy();
 
     // testscopeB should not be running at this point
@@ -478,7 +482,7 @@
 
     // First check that we have 2 scopes registered
     MetadataMap list = r->list();
-    EXPECT_EQ(2, list.size());
+    EXPECT_EQ(2u, list.size());
     EXPECT_NE(list.end(), list.find("testscopeA"));
     EXPECT_NE(list.end(), list.find("testscopeB"));
     EXPECT_EQ(list.end(), list.find("testscopeC"));
@@ -496,7 +500,7 @@
 
     // Now check that we have 3 scopes registered
     list = r->list();
-    EXPECT_EQ(3, list.size());
+    EXPECT_EQ(3u, list.size());
     EXPECT_NE(list.end(), list.find("testscopeA"));
     EXPECT_NE(list.end(), list.find("testscopeB"));
     EXPECT_NE(list.end(), list.find("testscopeC"));
@@ -540,7 +544,7 @@
 
     // First check that we have 2 scopes registered
     MetadataMap list = r->list();
-    EXPECT_EQ(2, list.size());
+    EXPECT_EQ(2u, list.size());
     EXPECT_NE(list.end(), list.find("testscopeA"));
     EXPECT_NE(list.end(), list.find("testscopeB"));
     EXPECT_EQ(list.end(), list.find("testscopeC"));
@@ -559,7 +563,7 @@
 
     // Now check that we have 3 scopes registered
     list = r->list();
-    EXPECT_EQ(3, list.size());
+    EXPECT_EQ(3u, list.size());
     EXPECT_NE(list.end(), list.find("testscopeA"));
     EXPECT_NE(list.end(), list.find("testscopeB"));
     EXPECT_NE(list.end(), list.find("testscopeC"));
@@ -617,7 +621,7 @@
 
     // Now check that we have 3 scopes registered again
     list = r->list();
-    EXPECT_EQ(3, list.size());
+    EXPECT_EQ(3u, list.size());
     EXPECT_NE(list.end(), list.find("testscopeA"));
     EXPECT_NE(list.end(), list.find("testscopeB"));
     EXPECT_EQ(list.end(), list.find("testscopeC"));
@@ -632,7 +636,7 @@
 
     // Now check that we are back to having 2 scopes registered
     list = r->list();
-    EXPECT_EQ(2, list.size());
+    EXPECT_EQ(2u, list.size());
     EXPECT_NE(list.end(), list.find("testscopeA"));
     EXPECT_NE(list.end(), list.find("testscopeB"));
     EXPECT_EQ(list.end(), list.find("testscopeC"));
@@ -645,7 +649,7 @@
 
     // Check that no scopes were registered
     list = r->list();
-    EXPECT_EQ(2, list.size());
+    EXPECT_EQ(2u, list.size());
     EXPECT_NE(list.end(), list.find("testscopeA"));
     EXPECT_NE(list.end(), list.find("testscopeB"));
     EXPECT_EQ(list.end(), list.find("testscopeC"));
@@ -660,7 +664,7 @@
 
     // Now check that we have 3 scopes registered
     list = r->list();
-    EXPECT_EQ(3, list.size());
+    EXPECT_EQ(3u, list.size());
     EXPECT_NE(list.end(), list.find("testscopeA"));
     EXPECT_NE(list.end(), list.find("testscopeB"));
     EXPECT_NE(list.end(), list.find("testscopeC"));
@@ -675,7 +679,7 @@
 
     // Now check that we are back to having 2 scopes registered
     list = r->list();
-    EXPECT_EQ(2, list.size());
+    EXPECT_EQ(2u, list.size());
     EXPECT_NE(list.end(), list.find("testscopeA"));
     EXPECT_NE(list.end(), list.find("testscopeB"));
     EXPECT_EQ(list.end(), list.find("testscopeC"));
 
=== modified file 'test/gtest/scopes/ReplyReaper/NoReplyScope.cpp'
--- test/gtest/scopes/ReplyReaper/NoReplyScope.cpp	2014-07-29 05:50:14 +0000
+++ test/gtest/scopes/ReplyReaper/NoReplyScope.cpp	2016-11-28 10:48:16 +0000
@@ -22,7 +22,10 @@
 
 #include <thread>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity::scopes;
 
=== modified file 'test/gtest/scopes/ReplyReaper/ReplyReaper_test.cpp'
--- test/gtest/scopes/ReplyReaper/ReplyReaper_test.cpp	2015-01-09 03:16:51 +0000
+++ test/gtest/scopes/ReplyReaper/ReplyReaper_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,11 @@
 #include <unity/scopes/internal/ScopeImpl.h>
 
 #include <boost/algorithm/string.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "NoReplyScope.h"
 #include <stdexcept>
 
=== modified file 'test/gtest/scopes/ResultCache/ResultCache_test.cpp'
--- test/gtest/scopes/ResultCache/ResultCache_test.cpp	2016-06-14 14:54:15 +0000
+++ test/gtest/scopes/ResultCache/ResultCache_test.cpp	2016-11-28 10:48:16 +0000
@@ -23,7 +23,12 @@
 #include <unity/scopes/OptionSelectorFilter.h>
 
 #include <boost/filesystem.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <cstdint>
 
 #include "CacheScope.h"
@@ -145,7 +150,7 @@
     receiver->wait_until_finished();
 
     auto r = receiver->result();
-    EXPECT_EQ(r, nullptr);
+    EXPECT_EQ(nullptr, r);
 }
 
 TEST_F(CacheScopeTest, non_surfacing_query)
@@ -157,11 +162,11 @@
     receiver->wait_until_finished();
 
     auto r = receiver->result();
-    EXPECT_EQ(r->title(), "some query");
+    EXPECT_EQ("some query", r->title());
     auto d = receiver->dept();
-    EXPECT_EQ(d->id(), "");
+    EXPECT_EQ("", d->id());
     auto sd = *d->subdepartments().begin();
-    EXPECT_EQ(sd->id(), "subsome query");
+    EXPECT_EQ("subsome query", sd->id());
 
     // Non-empty query, so there must be no cache file.
     boost::system::error_code ec;
@@ -181,13 +186,13 @@
     receiver->wait_until_finished();
 
     auto r = receiver->result();
-    EXPECT_EQ(r->title(), "");
-    EXPECT_EQ(r->value("int64value").get_int64_t(), 1);
-    EXPECT_EQ(r->value("int64value2").get_int64_t(), INT64_MAX);
+    EXPECT_EQ("", r->title());
+    EXPECT_EQ(1, r->value("int64value").get_int64_t());
+    EXPECT_EQ(INT64_MAX, r->value("int64value2").get_int64_t());
     auto d = receiver->dept();
-    EXPECT_EQ(d->id(), "");
+    EXPECT_EQ("", d->id());
     auto sd = *d->subdepartments().begin();
-    EXPECT_EQ(sd->id(), "sub");
+    EXPECT_EQ("sub", sd->id());
 
     // Empty query, so there must be a cache file.
     boost::system::error_code ec;
@@ -207,11 +212,11 @@
     receiver->wait_until_finished();
 
     auto r = receiver->result();
-    EXPECT_EQ(r->title(), "some other query");
+    EXPECT_EQ("some other query", r->title());
     auto d = receiver->dept();
-    EXPECT_EQ(d->id(), "");
+    EXPECT_EQ("", d->id());
     auto sd = *d->subdepartments().begin();
-    EXPECT_EQ(sd->id(), "subsome other query");
+    EXPECT_EQ("subsome other query", sd->id());
 
     // Cache file must still be there.
     boost::system::error_code ec;
@@ -225,15 +230,15 @@
     receiver->wait_until_finished();
 
     auto r = receiver->result();
-    EXPECT_EQ(r->title(), "");
-    EXPECT_EQ(r->value("int64value").get_int(), 1);
-    EXPECT_EQ(r->value("int64value2").get_int64_t(), INT64_MAX);
+    EXPECT_EQ("", r->title());
+    EXPECT_EQ(1, r->value("int64value").get_int());
+    EXPECT_EQ(INT64_MAX, r->value("int64value2").get_int64_t());
     auto d = receiver->dept();
-    EXPECT_EQ(d->id(), "");
+    EXPECT_EQ("", d->id());
     auto sd = *d->subdepartments().begin();
-    EXPECT_EQ(sd->id(), "sub");
+    EXPECT_EQ("sub", sd->id());
     auto filters = receiver->filters();
-    ASSERT_EQ(1, filters.size());
+    ASSERT_EQ(1u, filters.size());
     auto f = *filters.begin();
     EXPECT_EQ("option_selector", f->filter_type());
     EXPECT_EQ(nullptr, f->filter_group());
@@ -262,15 +267,15 @@
 
     auto r = receiver->result();
     ASSERT_TRUE(r != nullptr);
-    EXPECT_EQ(r->title(), "");
-    EXPECT_EQ(r->value("int64value").get_int(), 1);
-    EXPECT_EQ(r->value("int64value2").get_int64_t(), INT64_MAX);
+    EXPECT_EQ("", r->title());
+    EXPECT_EQ(1, r->value("int64value").get_int());
+    EXPECT_EQ(INT64_MAX, r->value("int64value2").get_int64_t());
     auto d = receiver->dept();
-    EXPECT_EQ(d->id(), "");
+    EXPECT_EQ("", d->id());
     auto sd = *d->subdepartments().begin();
-    EXPECT_EQ(sd->id(), "sub");
+    EXPECT_EQ("sub", sd->id());
     auto filters = receiver->filters();
-    ASSERT_EQ(1, filters.size());
+    ASSERT_EQ(1u, filters.size());
     auto f = *filters.begin();
     EXPECT_EQ("option_selector", f->filter_type());
     ASSERT_TRUE(f->filter_group() != nullptr);
@@ -317,14 +322,14 @@
     receiver->wait_until_finished();
 
     auto r = receiver->result();
-    EXPECT_EQ(r->title(), "");
-    EXPECT_EQ(r->value("int64value").get_int64_t(), 1);
+    EXPECT_EQ("", r->title());
+    EXPECT_EQ(1, r->value("int64value").get_int64_t());
     auto d = receiver->dept();
-    EXPECT_EQ(d->id(), "");
+    EXPECT_EQ("", d->id());
     auto sd = *d->subdepartments().begin();
-    EXPECT_EQ(sd->id(), "sub");
+    EXPECT_EQ("sub", sd->id());
     auto filters = receiver->filters();
-    ASSERT_EQ(1, filters.size());
+    ASSERT_EQ(1u, filters.size());
     auto f = *filters.begin();
     EXPECT_EQ("option_selector", f->filter_type());
     auto osf = dynamic_pointer_cast<OptionSelectorFilter const>(f);
@@ -342,7 +347,7 @@
     auto receiver = make_shared<Receiver>();
     scope()->search("", SearchMetadata("unused", "unused"), receiver);
     receiver->wait_until_finished();
-    EXPECT_EQ(receiver->result(), nullptr);
+    EXPECT_EQ(nullptr, receiver->result());
     ::chmod(TEST_RUNTIME_PATH "/unconfined/CacheScope/.surfacing_cache", 0600);
 
     // Cache file must still be there, but read will have failed.
@@ -362,7 +367,7 @@
     auto receiver = make_shared<Receiver>();
     scope()->search("", SearchMetadata("unused", "unused"), receiver);
     receiver->wait_until_finished();
-    EXPECT_EQ(receiver->result(), nullptr);
+    EXPECT_EQ(nullptr, receiver->result());
 
     // Cache file must still be there, but decode will have failed.
     boost::system::error_code ec;
@@ -376,7 +381,7 @@
     auto receiver = make_shared<Receiver>();
     scope()->search("", SearchMetadata("unused", "unused"), receiver);
     receiver->wait_until_finished();
-    EXPECT_EQ(receiver->result(), nullptr);
+    EXPECT_EQ(nullptr, receiver->result());
 
     // Cache file must still be there, but decode will have failed.
     boost::system::error_code ec;
@@ -390,7 +395,7 @@
     auto receiver = make_shared<Receiver>();
     scope()->search("", SearchMetadata("unused", "unused"), receiver);
     receiver->wait_until_finished();
-    EXPECT_EQ(receiver->result(), nullptr);
+    EXPECT_EQ(nullptr, receiver->result());
 
     // Cache file must still be there, but decode will have failed.
     boost::system::error_code ec;
@@ -404,7 +409,7 @@
     auto receiver = make_shared<Receiver>();
     scope()->search("", SearchMetadata("unused", "unused"), receiver);
     receiver->wait_until_finished();
-    EXPECT_EQ(receiver->result(), nullptr);
+    EXPECT_EQ(nullptr, receiver->result());
 
     // Cache file must still be there, but decode will have failed.
     boost::system::error_code ec;
 
=== modified file 'test/gtest/scopes/Runtime/PusherScope.cpp'
--- test/gtest/scopes/Runtime/PusherScope.cpp	2014-07-30 20:39:04 +0000
+++ test/gtest/scopes/Runtime/PusherScope.cpp	2016-11-28 10:48:16 +0000
@@ -25,7 +25,10 @@
 
 #include <atomic>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity::scopes;
 
=== modified file 'test/gtest/scopes/Runtime/Runtime_test.cpp'
--- test/gtest/scopes/Runtime/Runtime_test.cpp	2015-01-09 03:16:51 +0000
+++ test/gtest/scopes/Runtime/Runtime_test.cpp	2016-11-28 10:48:16 +0000
@@ -28,7 +28,10 @@
 #include <unity/scopes/SearchMetadata.h>
 #include <unity/UnityExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "PusherScope.h"
 #include "SlowCreateScope.h"
@@ -113,7 +116,7 @@
         EXPECT_EQ(1, annotation_count_);
         EXPECT_EQ(2, info_count_);
 
-        EXPECT_EQ(2, details.info_list().size());
+        EXPECT_EQ(2u, details.info_list().size());
         if (details.info_list().size() == 2)
         {
             EXPECT_EQ(OperationInfo::NoInternet, details.info_list()[0].code());
@@ -201,7 +204,7 @@
         EXPECT_EQ(2, data_pushes_);
         EXPECT_EQ(2, info_count_);
 
-        EXPECT_EQ(2, details.info_list().size());
+        EXPECT_EQ(2u, details.info_list().size());
         if (details.info_list().size() == 2)
         {
             EXPECT_EQ(OperationInfo::NoLocationData, details.info_list()[0].code());
 
=== modified file 'test/gtest/scopes/Runtime/SlowCreateScope.cpp'
--- test/gtest/scopes/Runtime/SlowCreateScope.cpp	2014-09-08 05:55:39 +0000
+++ test/gtest/scopes/Runtime/SlowCreateScope.cpp	2016-11-28 10:48:16 +0000
@@ -24,7 +24,10 @@
 #include <mutex>
 #include <thread>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity::scopes;
 
=== modified file 'test/gtest/scopes/Runtime/TestScope.cpp'
--- test/gtest/scopes/Runtime/TestScope.cpp	2014-07-30 20:39:04 +0000
+++ test/gtest/scopes/Runtime/TestScope.cpp	2016-11-28 10:48:16 +0000
@@ -25,7 +25,11 @@
 #include <unity/scopes/ScopeBase.h>
 #include <unity/scopes/SearchReply.h>
 #include <unity/UnityExceptions.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "TestScope.h"
 
 
=== modified file 'test/gtest/scopes/ScopeBase/ScopeBase_test.cpp'
--- test/gtest/scopes/ScopeBase/ScopeBase_test.cpp	2014-07-10 06:39:03 +0000
+++ test/gtest/scopes/ScopeBase/ScopeBase_test.cpp	2016-11-28 10:48:16 +0000
@@ -20,7 +20,10 @@
 #include <unity/scopes/internal/DynamicLoader.h>
 #include <unity/UnityExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
 
=== modified file 'test/gtest/scopes/ScopeExceptions/ScopeExceptions_test.cpp'
--- test/gtest/scopes/ScopeExceptions/ScopeExceptions_test.cpp	2014-04-17 01:36:29 +0000
+++ test/gtest/scopes/ScopeExceptions/ScopeExceptions_test.cpp	2016-11-28 10:48:16 +0000
@@ -18,7 +18,10 @@
 
 #include <unity/scopes/ScopeExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity::scopes;
 
=== modified file 'test/gtest/scopes/StandAloneScope/StandAloneScope_test.cpp'
--- test/gtest/scopes/StandAloneScope/StandAloneScope_test.cpp	2015-08-05 05:59:00 +0000
+++ test/gtest/scopes/StandAloneScope/StandAloneScope_test.cpp	2016-11-28 10:48:16 +0000
@@ -22,7 +22,10 @@
 #include <unity/scopes/SearchListenerBase.h>
 #include <unity/scopes/SearchMetadata.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <chrono>
 #include <condition_variable>
 
=== modified file 'test/gtest/scopes/StripLocation/StripLocation_test.cpp'
--- test/gtest/scopes/StripLocation/StripLocation_test.cpp	2015-03-02 07:04:42 +0000
+++ test/gtest/scopes/StripLocation/StripLocation_test.cpp	2016-11-28 10:48:16 +0000
@@ -20,7 +20,10 @@
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/SearchMetadata.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity::scopes;
 
=== modified file 'test/gtest/scopes/SwitchFilter/SwitchFilter_test.cpp'
--- test/gtest/scopes/SwitchFilter/SwitchFilter_test.cpp	2015-11-12 12:45:41 +0000
+++ test/gtest/scopes/SwitchFilter/SwitchFilter_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,11 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <unity/scopes/FilterState.h>
 #include <unity/scopes/SwitchFilter.h>
 #include <unity/scopes/internal/SwitchFilterImpl.h>
 
=== modified file 'test/gtest/scopes/ThrowingClient/ThrowingClient_test.cpp'
--- test/gtest/scopes/ThrowingClient/ThrowingClient_test.cpp	2015-11-26 05:48:01 +0000
+++ test/gtest/scopes/ThrowingClient/ThrowingClient_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,10 @@
 
 #include <unity/UnityExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <condition_variable>
 
@@ -325,7 +328,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    ASSERT_EQ(1, r.size());
+    ASSERT_EQ(1u, r.size());
     EXPECT_EQ("success", r[0].title());
 }
 
@@ -413,7 +416,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    ASSERT_EQ(1, r.size());
+    ASSERT_EQ(1u, r.size());
     EXPECT_EQ(r[0].title(), "success");
 
     auto plistener = make_shared<PreviewListener>();
@@ -433,7 +436,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    ASSERT_EQ(1, r.size());
+    ASSERT_EQ(1u, r.size());
     EXPECT_EQ(r[0].title(), "success");
 
     auto plistener = make_shared<PreviewListener>("throw from preview push layout");
@@ -454,7 +457,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    ASSERT_EQ(1, r.size());
+    ASSERT_EQ(1u, r.size());
     EXPECT_EQ(r[0].title(), "success");
 
     auto plistener = make_shared<PreviewListener>("throw from preview push widget");
@@ -475,7 +478,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    ASSERT_EQ(1, r.size());
+    ASSERT_EQ(1u, r.size());
     EXPECT_EQ(r[0].title(), "success");
 
     auto plistener = make_shared<PreviewListener>("throw from preview push attribute");
@@ -496,7 +499,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    ASSERT_EQ(1, r.size());
+    ASSERT_EQ(1u, r.size());
     EXPECT_EQ(r[0].title(), "success");
 
     auto plistener = make_shared<PreviewListener>("throw from preview finished");
@@ -516,7 +519,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    ASSERT_EQ(1, r.size());
+    ASSERT_EQ(1u, r.size());
     EXPECT_EQ(r[0].title(), "success");
 
     auto alistener = make_shared<ActivationListener>();
@@ -536,7 +539,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    ASSERT_EQ(1, r.size());
+    ASSERT_EQ(1u, r.size());
     EXPECT_EQ(r[0].title(), "success");
 
     auto alistener = make_shared<ActivationListener>("throw from activation activate");
@@ -557,7 +560,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    ASSERT_EQ(1, r.size());
+    ASSERT_EQ(1u, r.size());
     EXPECT_EQ(r[0].title(), "success");
 
     auto alistener = make_shared<ActivationListener>("throw from activation finished");
 
=== modified file 'test/gtest/scopes/ThrowingScope/ThrowingScope_test.cpp'
--- test/gtest/scopes/ThrowingScope/ThrowingScope_test.cpp	2015-02-06 06:33:23 +0000
+++ test/gtest/scopes/ThrowingScope/ThrowingScope_test.cpp	2016-11-28 10:48:16 +0000
@@ -20,7 +20,10 @@
 #include <unity/scopes/QueryCtrl.h>
 #include <unity/scopes/Runtime.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <condition_variable>
 #include <thread>
@@ -240,7 +243,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    EXPECT_EQ(1, r.size());
+    EXPECT_EQ(1u, r.size());
 }
 
 TEST_F(ThrowingScopeTest, throw_from_search)
@@ -255,7 +258,7 @@
                   "    unity::ResourceException: exception from search",
               receiver->completion_msg());
     auto r = receiver->results();
-    EXPECT_EQ(0, r.size());
+    EXPECT_EQ(0u, r.size());
 }
 
 TEST_F(ThrowingScopeTest, throw_from_run)
@@ -267,7 +270,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::Error, receiver->completion_status());
     EXPECT_EQ("QueryBase::run(): unity::ResourceException: exception from run", receiver->completion_msg());
     auto r = receiver->results();
-    EXPECT_EQ(0, r.size());
+    EXPECT_EQ(0u, r.size());
 }
 
 TEST_F(ThrowingScopeTest, throw_from_cancelled)
@@ -280,7 +283,7 @@
     receiver->wait_until_finished();
 
     auto r = receiver->results();
-    EXPECT_EQ(0, r.size());
+    EXPECT_EQ(0u, r.size());
 
     EXPECT_EQ(CompletionDetails::CompletionStatus::Cancelled, receiver->completion_status());
     // No exception string here because we short-cut the cancellation on the client side.
@@ -297,7 +300,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    EXPECT_EQ(1, r.size());
+    EXPECT_EQ(1u, r.size());
 
     auto plistener = make_shared<PreviewListener>();
     scope()->preview(r[0], ActionMetadata("unused", "unused"), plistener);
@@ -319,7 +322,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    EXPECT_EQ(1, r.size());
+    EXPECT_EQ(1u, r.size());
 
     auto plistener = make_shared<PreviewListener>();
     scope()->preview(r[0], ActionMetadata("unused", "unused"), plistener);
@@ -338,7 +341,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    EXPECT_EQ(1, r.size());
+    EXPECT_EQ(1u, r.size());
 
     auto plistener = make_shared<PreviewListener>();
     auto ctrl = scope()->preview(r[0], ActionMetadata("unused", "unused"), plistener);
@@ -361,7 +364,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    EXPECT_EQ(1, r.size());
+    EXPECT_EQ(1u, r.size());
 
     auto alistener = make_shared<ActivationListener>();
     scope()->activate(r[0], ActionMetadata("unused", "unused"), alistener);
@@ -383,7 +386,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    EXPECT_EQ(1, r.size());
+    EXPECT_EQ(1u, r.size());
 
     auto alistener = make_shared<ActivationListener>();
     scope()->activate(r[0], ActionMetadata("unused", "unused"), alistener);
@@ -403,7 +406,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    EXPECT_EQ(1, r.size());
+    EXPECT_EQ(1u, r.size());
 
     auto alistener = make_shared<ActivationListener>();
     auto ctrl = scope()->activate(r[0], ActionMetadata("unused", "unused"), alistener);
@@ -426,7 +429,7 @@
     EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
     EXPECT_EQ("", receiver->completion_msg());
     auto r = receiver->results();
-    EXPECT_EQ(1, r.size());
+    EXPECT_EQ(1u, r.size());
 
     auto alistener = make_shared<ActivationListener>();
     scope()->perform_action(r[0], ActionMetadata("unused", "unused"), "", "", alistener);
 
=== modified file 'test/gtest/scopes/ValueSliderFilter/ValueSliderFilter_test.cpp'
--- test/gtest/scopes/ValueSliderFilter/ValueSliderFilter_test.cpp	2016-03-11 13:21:36 +0000
+++ test/gtest/scopes/ValueSliderFilter/ValueSliderFilter_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,11 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <unity/scopes/FilterState.h>
 #include <unity/scopes/ValueSliderFilter.h>
 #include <unity/scopes/ValueSliderLabels.h>
@@ -45,7 +49,7 @@
         EXPECT_EQ("f1", filter1->id());
         EXPECT_EQ("Min", filter1->labels().min_label());
         EXPECT_EQ("Max", filter1->labels().max_label());
-        EXPECT_EQ(2, filter1->labels().extra_labels().size());
+        EXPECT_EQ(2u, filter1->labels().extra_labels().size());
         EXPECT_EQ("Ten", filter1->labels().extra_labels()[0].second);
         EXPECT_EQ("Fifty", filter1->labels().extra_labels()[1].second);
         EXPECT_EQ(50, filter1->default_value());
@@ -115,7 +119,7 @@
     EXPECT_EQ("f1", filter2->id());
     EXPECT_EQ("Min", filter2->labels().min_label());
     EXPECT_EQ("Max", filter2->labels().max_label());
-    EXPECT_EQ(1, filter2->labels().extra_labels().size());
+    EXPECT_EQ(1u, filter2->labels().extra_labels().size());
     EXPECT_EQ(10, filter2->labels().extra_labels()[0].first);
     EXPECT_EQ("Ten", filter2->labels().extra_labels()[0].second);
     EXPECT_EQ(1, filter2->min());
 
=== modified file 'test/gtest/scopes/Variant/Variant_test.cpp'
--- test/gtest/scopes/Variant/Variant_test.cpp	2015-06-17 10:15:34 +0000
+++ test/gtest/scopes/Variant/Variant_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,10 @@
 
 #include <boost/variant.hpp>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity;
@@ -292,12 +295,12 @@
 
     v = Variant::deserialize_json("{\"foo\": \"bar\"}");
     VariantMap vm = v.get_dict();
-    EXPECT_EQ(1, vm.size());
+    EXPECT_EQ(1u, vm.size());
     EXPECT_EQ("bar", vm.at("foo").get_string());
 
     v = Variant::deserialize_json("[1, \"two\"]");
     VariantArray va = v.get_array();
-    EXPECT_EQ(2, va.size());
+    EXPECT_EQ(2u, va.size());
     EXPECT_EQ(1, va[0].get_int());
     EXPECT_EQ("two", va[1].get_string());
 }
 
=== modified file 'test/gtest/scopes/VariantBuilder/VariantBuilder_test.cpp'
--- test/gtest/scopes/VariantBuilder/VariantBuilder_test.cpp	2014-02-25 12:08:41 +0000
+++ test/gtest/scopes/VariantBuilder/VariantBuilder_test.cpp	2016-11-28 10:48:16 +0000
@@ -17,8 +17,12 @@
 */
 
 #include <unity/scopes/VariantBuilder.h>
+#include <unity/UnityExceptions.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
-#include <unity/UnityExceptions.h>
+#pragma GCC diagnostic pop
 
 using namespace unity;
 using namespace unity::scopes;
 
=== modified file 'test/gtest/scopes/Version/Version_test.cpp'
--- test/gtest/scopes/Version/Version_test.cpp	2014-01-07 12:22:29 +0000
+++ test/gtest/scopes/Version/Version_test.cpp	2016-11-28 10:48:16 +0000
@@ -18,7 +18,10 @@
 
 #include <unity/scopes/Version.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace unity::scopes;
 
 
=== modified file 'test/gtest/scopes/internal/CategoryRegistry/CategoryRegistry_test.cpp'
--- test/gtest/scopes/internal/CategoryRegistry/CategoryRegistry_test.cpp	2014-07-02 09:36:34 +0000
+++ test/gtest/scopes/internal/CategoryRegistry/CategoryRegistry_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,10 @@
 #include <unity/UnityExceptions.h>
 #include <unity/scopes/Variant.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity;
 
=== modified file 'test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp'
--- test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp	2014-07-07 23:53:36 +0000
+++ test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp	2016-11-28 10:48:16 +0000
@@ -20,7 +20,10 @@
 #include <unity/scopes/ScopeExceptions.h>
 #include <unity/UnityExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity;
 
=== modified file 'test/gtest/scopes/internal/DynamicLoader/DynamicLoader_test.cpp'
--- test/gtest/scopes/internal/DynamicLoader/DynamicLoader_test.cpp	2014-08-28 00:20:56 +0000
+++ test/gtest/scopes/internal/DynamicLoader/DynamicLoader_test.cpp	2016-11-28 10:48:16 +0000
@@ -19,7 +19,10 @@
 #include <unity/scopes/internal/DynamicLoader.h>
 #include <unity/UnityExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <boost/regex.hpp>  // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
 using namespace std;
 
=== modified file 'test/gtest/scopes/internal/IniSettingsSchema/IniSettingsSchema_test.cpp'
--- test/gtest/scopes/internal/IniSettingsSchema/IniSettingsSchema_test.cpp	2014-11-20 21:33:33 +0000
+++ test/gtest/scopes/internal/IniSettingsSchema/IniSettingsSchema_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,10 @@
 #include <unity/UnityExceptions.h>
 
 #include <boost/regex.hpp>  // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace unity;
 using namespace unity::scopes;
@@ -34,7 +37,7 @@
     s->add_location_setting();
 
     auto defs = s->definitions();
-    ASSERT_EQ(9, defs.size());
+    ASSERT_EQ(9u, defs.size());
 
     EXPECT_EQ("location", defs[0].get_dict()["id"].get_string());
     EXPECT_EQ("string", defs[0].get_dict()["type"].get_string());
@@ -45,7 +48,7 @@
     EXPECT_EQ("list", defs[1].get_dict()["type"].get_string());
     EXPECT_EQ("Temperature Unit", defs[1].get_dict()["displayName"].get_string());
     EXPECT_EQ(1, defs[1].get_dict()["defaultValue"].get_int());
-    ASSERT_EQ(2, defs[1].get_dict()["displayValues"].get_array().size());
+    ASSERT_EQ(2u, defs[1].get_dict()["displayValues"].get_array().size());
     EXPECT_EQ("Celsius", defs[1].get_dict()["displayValues"].get_array()[0].get_string());
     EXPECT_EQ("Fahrenheit", defs[1].get_dict()["displayValues"].get_array()[1].get_string());
 
@@ -204,7 +207,7 @@
 
         EXPECT_EQ("tempUnit", defs[1].get_dict()["id"].get_string());
         EXPECT_EQ("testTemperature Unit", defs[1].get_dict()["displayName"].get_string());
-        ASSERT_EQ(2, defs[1].get_dict()["displayValues"].get_array().size());
+        ASSERT_EQ(2u, defs[1].get_dict()["displayValues"].get_array().size());
         EXPECT_EQ("testCelsius", defs[1].get_dict()["displayValues"].get_array()[0].get_string());
         EXPECT_EQ("testFahrenheit", defs[1].get_dict()["displayValues"].get_array()[1].get_string());
     }
@@ -215,11 +218,11 @@
         auto s = IniSettingsSchema::create(TEST_SRC_DIR "/locale_fallback.ini");
 
         auto defs = s->definitions();
-        ASSERT_EQ(1, defs.size());
+        ASSERT_EQ(1u, defs.size());
 
         EXPECT_EQ("tempUnit", defs[0].get_dict()["id"].get_string());
         EXPECT_EQ("Temperature Unit", defs[0].get_dict()["displayName"].get_string());
-        ASSERT_EQ(2, defs[0].get_dict()["displayValues"].get_array().size());
+        ASSERT_EQ(2u, defs[0].get_dict()["displayValues"].get_array().size());
         EXPECT_EQ("Celsius", defs[0].get_dict()["displayValues"].get_array()[0].get_string());
         EXPECT_EQ("Fahrenheit", defs[0].get_dict()["displayValues"].get_array()[1].get_string());
     }
@@ -235,7 +238,7 @@
     s->add_location_setting();
     {
         auto defs = s->definitions();
-        ASSERT_EQ(1, defs.size());
+        ASSERT_EQ(1u, defs.size());
 
         EXPECT_EQ("internal.location", defs[0].get_dict()["id"].get_string());
         EXPECT_EQ("Enable location data", defs[0].get_dict()["displayName"].get_string());
 
=== modified file 'test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp'
--- test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp	2016-05-27 11:26:53 +0000
+++ test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp	2016-11-28 10:48:16 +0000
@@ -20,7 +20,11 @@
 #include <unity/UnityExceptions.h>
 #include <unity/scopes/Variant.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <memory>
 #include <algorithm>
 
 
=== modified file 'test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp'
--- test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp	2016-05-27 11:03:57 +0000
+++ test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,10 @@
 #include <unity/UnityExceptions.h>
 #include <unity/util/FileIO.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace unity;
 using namespace unity::scopes;
@@ -118,7 +121,7 @@
     auto s = JsonSettingsSchema::create(ok_schema);
 
     auto defs = s->definitions();
-    EXPECT_EQ(11, defs.size());
+    EXPECT_EQ(11u, defs.size());
 
     EXPECT_EQ("location", defs[0].get_dict()["id"].get_string());
     EXPECT_EQ("string", defs[0].get_dict()["type"].get_string());
@@ -129,7 +132,7 @@
     EXPECT_EQ("list", defs[1].get_dict()["type"].get_string());
     EXPECT_EQ("Temperature Units", defs[1].get_dict()["displayName"].get_string());
     EXPECT_EQ(1, defs[1].get_dict()["defaultValue"].get_int());
-    EXPECT_EQ(2, defs[1].get_dict()["displayValues"].get_array().size());
+    EXPECT_EQ(2u, defs[1].get_dict()["displayValues"].get_array().size());
     EXPECT_EQ("Celsius", defs[1].get_dict()["displayValues"].get_array()[0].get_string());
     EXPECT_EQ("Fahrenheit", defs[1].get_dict()["displayValues"].get_array()[1].get_string());
 
@@ -181,7 +184,7 @@
     auto s = JsonSettingsSchema::create(schema);
 
     auto defs = s->definitions();
-    EXPECT_EQ(2, defs.size());
+    EXPECT_EQ(2u, defs.size());
 
     EXPECT_EQ(3.14, defs[0].get_dict()["defaultValue"].get_double());
     EXPECT_EQ(2147483648, defs[1].get_dict()["defaultValue"].get_double());
@@ -705,7 +708,7 @@
     s->add_location_setting();
     {
         auto defs = s->definitions();
-        ASSERT_EQ(1, defs.size());
+        ASSERT_EQ(1u, defs.size());
 
         EXPECT_EQ("internal.location", defs[0].get_dict()["id"].get_string());
         EXPECT_EQ("Enable location data", defs[0].get_dict()["displayName"].get_string());
 
=== modified file 'test/gtest/scopes/internal/Logger/Logger_test.cpp'
--- test/gtest/scopes/internal/Logger/Logger_test.cpp	2016-02-22 04:35:26 +0000
+++ test/gtest/scopes/internal/Logger/Logger_test.cpp	2016-11-28 10:48:16 +0000
@@ -19,7 +19,12 @@
 #include <unity/scopes/internal/Logger.h>
 
 #include <boost/algorithm/string.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <unity/UnityExceptions.h>
 
 using namespace std;
 
=== modified file 'test/gtest/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp'
--- test/gtest/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp	2014-12-02 00:16:04 +0000
+++ test/gtest/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp	2016-11-28 10:48:16 +0000
@@ -19,7 +19,10 @@
 #include <unity/scopes/internal/MiddlewareFactory.h>
 #include <unity/scopes/ScopeExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity::scopes;
 
=== modified file 'test/gtest/scopes/internal/Reaper/Reaper_test.cpp'
--- test/gtest/scopes/internal/Reaper/Reaper_test.cpp	2014-11-05 05:00:38 +0000
+++ test/gtest/scopes/internal/Reaper/Reaper_test.cpp	2016-11-28 10:48:16 +0000
@@ -20,7 +20,10 @@
 
 #include <unity/UnityExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity::scopes;
@@ -200,17 +203,17 @@
         auto e1 = r->add([]{});
         auto e2 = r->add([]{});
         auto e3 = r->add([]{});
-        EXPECT_EQ(3, r->size());
+        EXPECT_EQ(3u, r->size());
         e2->cancel();
-        EXPECT_EQ(2, r->size());
+        EXPECT_EQ(2u, r->size());
 
         r->destroy();
 
-        EXPECT_EQ(2, r->size());
+        EXPECT_EQ(2u, r->size());
         e3->cancel();
-        EXPECT_EQ(1, r->size());
+        EXPECT_EQ(1u, r->size());
         e1->cancel();
-        EXPECT_EQ(0, r->size());
+        EXPECT_EQ(0u, r->size());
     }
 }
 
@@ -326,7 +329,7 @@
         // Now we destroy the reaper, *before* the pass at t == 6.0.
         // Because CallbackOnDestroy is set, e3 is reaped.
         r->destroy();
-        EXPECT_EQ(0, r->size());
+        EXPECT_EQ(0u, r->size());
         EXPECT_EQ(1, c1.get());
         EXPECT_EQ(0, c2.get());
         EXPECT_EQ(1, c3.get());    // Callback for e3 must have been invoked.
@@ -361,7 +364,7 @@
 
         // e1 is oldest, so at the tail of the reap list.
 
-        EXPECT_EQ(2, r->size());
+        EXPECT_EQ(2u, r->size());
         EXPECT_LT(t(), 2000);
 
         this_thread::sleep_for(chrono::milliseconds(2500));  // At t == 2.0, reaper kicks in.
@@ -370,14 +373,14 @@
         EXPECT_GE(t(), 2500);
         EXPECT_EQ(1, c1.get());             // Was reaped at t ~ 2.0 (tested by lambda on c1)
         EXPECT_EQ(0, c2.get());             // Expires at t ~ 2.0, but not reaped yet, because c1 has not completed
-        EXPECT_EQ(1, r->size());            // e2 must still be there
+        EXPECT_EQ(1u, r->size());            // e2 must still be there
 
         // We null out e2 while the reaping pass is still stuck in the callback for e1.
         EXPECT_LT(t(), 3000);
         e2 = nullptr;                       // Blocks until e1's callback completes at t ~ 3.0 (tested by lambda on c2)
         EXPECT_GE(t(), 3000);
         EXPECT_EQ(0, c2.get());
-        EXPECT_EQ(0, r->size());
+        EXPECT_EQ(0u, r->size());
     }
 }
 
@@ -419,7 +422,7 @@
         SelfDestroy sd(r);
         this_thread::sleep_for(chrono::milliseconds(1500));
         EXPECT_TRUE(sd.called());
-        EXPECT_EQ(0, r->size());
+        EXPECT_EQ(0u, r->size());
     }
 }
 
@@ -441,13 +444,13 @@
 
         e1->refresh();
         e2->cancel();
-        EXPECT_EQ(2, r->size());
+        EXPECT_EQ(2u, r->size());
         EXPECT_EQ(0, c1.get());
         EXPECT_EQ(0, c2.get());
         EXPECT_EQ(0, c3.get());
 
         r->destroy();
-        EXPECT_EQ(0, r->size());
+        EXPECT_EQ(0u, r->size());
         EXPECT_EQ(1, c1.get());
         EXPECT_EQ(0, c2.get());
         EXPECT_EQ(1, c3.get());
@@ -466,13 +469,13 @@
 
         e1->refresh();
         e2->cancel();
-        EXPECT_EQ(2, r->size());
+        EXPECT_EQ(2u, r->size());
         EXPECT_EQ(0, c1.get());
         EXPECT_EQ(0, c2.get());
         EXPECT_EQ(0, c3.get());
 
         r->destroy();
-        EXPECT_EQ(2, r->size());
+        EXPECT_EQ(2u, r->size());
         EXPECT_EQ(0, c1.get());
         EXPECT_EQ(0, c2.get());
         EXPECT_EQ(0, c3.get());
 
=== modified file 'test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp'
--- test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp	2015-08-04 04:56:01 +0000
+++ test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,10 @@
 #include <unity/scopes/ScopeExceptions.h>
 
 #include <boost/regex.hpp>  // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity;
 
=== modified file 'test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp'
--- test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp	2015-05-29 10:17:42 +0000
+++ test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp	2016-11-28 10:48:16 +0000
@@ -24,8 +24,10 @@
 #include <unity/UnityExceptions.h>
 #include <unity/scopes/ScopeExceptions.h>
 
-#include <gtest/gtest.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gmock/gmock.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace testing;
 
=== modified file 'test/gtest/scopes/internal/ResultReplyObject/ResultReplyObject_test.cpp'
--- test/gtest/scopes/internal/ResultReplyObject/ResultReplyObject_test.cpp	2014-12-01 08:21:05 +0000
+++ test/gtest/scopes/internal/ResultReplyObject/ResultReplyObject_test.cpp	2016-11-28 10:48:16 +0000
@@ -23,7 +23,11 @@
 #include <unity/scopes/SearchListenerBase.h>
 #include <unity/scopes/Department.h>
 #include <unity/scopes/CategorisedResult.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
 
=== modified file 'test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp'
--- test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp	2016-02-22 01:29:01 +0000
+++ test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp	2016-11-28 10:48:16 +0000
@@ -24,7 +24,10 @@
 #include <unity/UnityExceptions.h>
 
 #include <boost/regex.hpp>  // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity::scopes;
 
=== modified file 'test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp'
--- test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp	2014-12-04 04:33:50 +0000
+++ test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp	2016-11-28 10:48:16 +0000
@@ -25,7 +25,11 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <fstream>
 
 
=== modified file 'test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp'
--- test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2016-10-13 11:57:05 +0000
+++ test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2016-11-28 10:48:16 +0000
@@ -23,7 +23,10 @@
 #include <unity/UnityExceptions.h>
 
 #include <boost/regex.hpp>  // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
@@ -65,7 +68,7 @@
         EXPECT_TRUE(cfg.is_aggregator());
 
         auto attrs = cfg.appearance_attributes();
-        EXPECT_EQ(5, attrs.size());
+        EXPECT_EQ(5u, attrs.size());
         EXPECT_TRUE(attrs["arbitrary_key"].get_bool());
         EXPECT_EQ("bar", attrs["another_one"].get_string());
         EXPECT_EQ(11, attrs["num_key"].get_int());
@@ -97,7 +100,7 @@
         EXPECT_EQ(0, cfg.version());
         EXPECT_FALSE(cfg.is_aggregator());
 
-        EXPECT_EQ(0, cfg.appearance_attributes().size());
+        EXPECT_EQ(0u, cfg.appearance_attributes().size());
 
         // Optional items that throw if not set
 
@@ -137,13 +140,13 @@
 TEST(ScopeConfig, empty_scope_ids)
 {
     ScopeConfig cfg(EMPTY_CHILD_IDS);
-    EXPECT_EQ(cfg.child_scope_ids().size(), 0);
+    EXPECT_EQ(0u, cfg.child_scope_ids().size());
 }
 
 TEST(ScopeConfig, single_scope_id)
 {
     ScopeConfig cfg(SINGLE_CHILD_ID);
-    EXPECT_EQ(cfg.child_scope_ids().size(), 1);
+    EXPECT_EQ(1u, cfg.child_scope_ids().size());
 }
 
 TEST(ScopeConfig, bad_timeout)
@@ -206,13 +209,13 @@
 TEST(ScopeConfig, empty_keywords)
 {
     ScopeConfig cfg(EMPTY_KEYWORDS);
-    EXPECT_EQ(cfg.keywords().size(), 0);
+    EXPECT_EQ(0u, cfg.keywords().size());
 }
 
 TEST(ScopeConfig, single_keyword)
 {
     ScopeConfig cfg(SINGLE_KEYWORD);
-    EXPECT_EQ(cfg.keywords().size(), 1);
+    EXPECT_EQ(1u, cfg.keywords().size());
 }
 
 TEST(ScopeConfig, empty_display_name)
 
=== modified file 'test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp'
--- test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp	2014-08-28 00:20:56 +0000
+++ test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,10 @@
 #include <unity/scopes/internal/ScopeLoader.h>
 #include <unity/UnityExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <boost/regex.hpp>  // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
 #include "Counters.h"
 
=== modified file 'test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp'
--- test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp	2015-01-27 12:46:11 +0000
+++ test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp	2016-11-28 10:48:16 +0000
@@ -25,7 +25,10 @@
 #include <unity/UnityExceptions.h>
 
 #include <boost/regex.hpp>  // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity;
@@ -61,7 +64,7 @@
     EXPECT_EQ("display_name", m.display_name());
     EXPECT_EQ("description", m.description());
     EXPECT_EQ("author", m.author());
-    EXPECT_EQ(0, m.appearance_attributes().size());
+    EXPECT_EQ(0u, m.appearance_attributes().size());
     EXPECT_EQ(ScopeMetadata::ResultsTtlType::Medium, m.results_ttl_type());
 
     // Check that optional fields that are not set throw
@@ -144,7 +147,7 @@
     EXPECT_EQ("display_name", mi2->display_name());
     EXPECT_EQ("description", mi2->description());
     EXPECT_EQ("author", mi2->author());
-    EXPECT_EQ(0, mi2->appearance_attributes().size());
+    EXPECT_EQ(0u, mi2->appearance_attributes().size());
     EXPECT_EQ(ScopeMetadata::ResultsTtlType::Medium, mi2->results_ttl_type());
     EXPECT_EQ(0, mi2->version());
 
 
=== modified file 'test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp'
--- test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp	2016-03-15 04:36:08 +0000
+++ test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp	2016-11-28 10:48:16 +0000
@@ -24,7 +24,11 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>  // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <fcntl.h>
 #include <ctime>
 #include <thread>
@@ -91,7 +95,7 @@
         auto db = SettingsDB::create_from_ini_file(db_name, schema);
 
         // If db doesn't exist, default values are returned.
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("London", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(1, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
@@ -101,7 +105,7 @@
         write_db("db_empty.ini");
 
         // Default values must still be there.
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("London", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(1, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
@@ -111,7 +115,7 @@
         write_db("db_unknown_setting.ini");
 
         // Default values must still be there.
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("London", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(1, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
@@ -119,7 +123,7 @@
 
         // Change the location.
         write_db("db_location.ini");
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(1, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
@@ -127,7 +131,7 @@
 
         // Change the unit.
         write_db("db_loctemp.ini");
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
@@ -135,7 +139,7 @@
 
         // Change the age.
         write_db("db_loctempage.ini");
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(42.0, db->settings()["ageSetting"].get_double());
@@ -144,7 +148,7 @@
         // Call settings again. This causes state_changed_ in the implementation
         // to remain false because the generation count hasn't changed, meaning
         // that we must see the same unchanged values as last time.
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(42, db->settings()["ageSetting"].get_double());
@@ -152,7 +156,7 @@
 
         // Change enabled boolean.
         write_db("db_loctempageenabled.ini");
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(42, db->settings()["ageSetting"].get_double());
@@ -167,7 +171,7 @@
         auto db = SettingsDB::create_from_ini_file(db_name, schema);
 
         // Check that we now can see only the other two values. (DB doesn't exist yet.)
-        EXPECT_EQ(2, db->settings().size());
+        EXPECT_EQ(2u, db->settings().size());
         EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
         EXPECT_TRUE(db->settings()["enabledSetting"].get_bool());
 
@@ -175,7 +179,7 @@
         write_db("db_loctemp.ini");
 
         // Check that they are correct
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
@@ -193,7 +197,7 @@
         write_db("db_loctemp.ini");
 
         // Check that they are correct.
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
@@ -203,7 +207,7 @@
         write_db("db_loctemp_bad_age.ini");
 
         // Check that nothing has changed.
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("Paris", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
@@ -220,12 +224,12 @@
         auto db = SettingsDB::create_from_ini_file(db_name, schema);
 
         // If db doesn't exist, default values are returned.
-        EXPECT_EQ(1, db->settings().size());
+        EXPECT_EQ(1u, db->settings().size());
         EXPECT_EQ("的", db->settings()["locationSetting"].get_string());
 
         // Change the location.
         write_db("db_chinese_location.ini");
-        EXPECT_EQ(1, db->settings().size());
+        EXPECT_EQ(1u, db->settings().size());
         EXPECT_EQ("丈", db->settings()["locationSetting"].get_string());
     }
 }
@@ -239,7 +243,7 @@
         auto db = SettingsDB::create_from_ini_file(db_name, schema);
 
         // If db doesn't exist, default values are returned.
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("London", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(1, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
@@ -249,7 +253,7 @@
         write_db("db_loctempageenabled.ini");
 
         // Settings should be updated.
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(42, db->settings()["ageSetting"].get_double());
@@ -259,7 +263,7 @@
         unlink(db_name.c_str());
 
         // Default values should come back.
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("London", db->settings()["locationSetting"].get_string());
         EXPECT_EQ(1, db->settings()["unitTempSetting"].get_int());
         EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
@@ -290,12 +294,12 @@
         auto db = SettingsDB::create_from_json_string(db_name, ok_schema);
 
         // If db doesn't exist, default values are returned.
-        EXPECT_EQ(1, db->settings().size());
+        EXPECT_EQ(1u, db->settings().size());
         EXPECT_EQ("London", db->settings()["location"].get_string());
 
         // Change the location.
         write_db("db_location_json.ini");
-        EXPECT_EQ(1, db->settings().size());
+        EXPECT_EQ(1u, db->settings().size());
         EXPECT_EQ("New York", db->settings()["location"].get_string());
     }
 }
@@ -363,7 +367,7 @@
         auto schema = TEST_SRC_DIR "/schema.ini";
         auto db = SettingsDB::create_from_ini_file(db_name, schema);
 
-        EXPECT_EQ(4, db->settings().size());
+        EXPECT_EQ(4u, db->settings().size());
         EXPECT_EQ("Munich", db->settings()["locationSetting"].get_string());
 
 
@@ -381,7 +385,7 @@
     }
     catch (ResourceException const& e)
     {
-        boost::regex r("unity::ResourceException: unity::FileException: Could not load ini file .*: Key file contains line 'x' which is not a key-value pair, group, or comment \\(errno = 1\\)");
+        boost::regex r("unity::ResourceException: unity::FileException: Could not load ini file .*: Key file contains line .*");
         EXPECT_TRUE(boost::regex_match(e.what(), r)) << e.what();
     }
 }
 
=== modified file 'test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp'
--- test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp	2014-09-22 05:50:56 +0000
+++ test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp	2016-11-28 10:48:16 +0000
@@ -20,7 +20,11 @@
 
 #include <unity/UnityExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <valgrind/valgrind.h>
 
 using namespace std;
 
=== modified file 'test/gtest/scopes/internal/ThreadSafeQueue/ThreadSafeQueue_test.cpp'
--- test/gtest/scopes/internal/ThreadSafeQueue/ThreadSafeQueue_test.cpp	2014-09-08 05:55:39 +0000
+++ test/gtest/scopes/internal/ThreadSafeQueue/ThreadSafeQueue_test.cpp	2016-11-28 10:48:16 +0000
@@ -18,7 +18,10 @@
 
 #include <unity/scopes/internal/ThreadSafeQueue.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <future>
 
 
=== modified file 'test/gtest/scopes/internal/UniqueID/UniqueID_test.cpp'
--- test/gtest/scopes/internal/UniqueID/UniqueID_test.cpp	2014-02-25 12:08:41 +0000
+++ test/gtest/scopes/internal/UniqueID/UniqueID_test.cpp	2016-11-28 10:48:16 +0000
@@ -18,7 +18,10 @@
 
 #include <unity/scopes/internal/UniqueID.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity::scopes::internal;
 
=== modified file 'test/gtest/scopes/internal/Utils/Utils_test.cpp'
--- test/gtest/scopes/internal/Utils/Utils_test.cpp	2016-10-07 15:42:53 +0000
+++ test/gtest/scopes/internal/Utils/Utils_test.cpp	2016-11-28 10:48:16 +0000
@@ -18,9 +18,14 @@
 
 #include <unity/scopes/internal/Utils.h>
 
+#include <unity/UnityExceptions.h>
+
 #include <boost/filesystem.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
-#include <unity/UnityExceptions.h>
+#pragma GCC diagnostic pop
 
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
@@ -39,13 +44,24 @@
 
 TEST(Utils, uncamelcase_turkish)
 {
-    char *old_locale = strdup(getenv("LC_ALL"));
+    string old_locale;
+    char const* p = getenv("LC_ALL");
+    if (p)
+    {
+        old_locale = p;
+    }
     setenv("LC_ALL", "tr_TR.UTF-8", 1);
 
     EXPECT_EQ("small-i", uncamelcase("smallI"));
 
-    setenv("LC_ALL", old_locale, 1);
-    free(old_locale);
+    if (!old_locale.empty())
+    {
+        setenv("LC_ALL", old_locale.c_str(), 1);
+    }
+    else
+    {
+        unsetenv("LC_ALL");
+    }
 }
 
 TEST(Utils, convert_to)
@@ -170,7 +186,7 @@
 
     // Test argument splitting
     auto exec_args = split_exec_args("test", "/path\\ to/exec' 'file arg \"arg 2\" arg' '3 arg\\ 4");
-    ASSERT_EQ(5, exec_args.size());
+    ASSERT_EQ(5u, exec_args.size());
     EXPECT_STREQ("\"/path to/exec file\"", exec_args[0].c_str());
     EXPECT_STREQ("arg", exec_args[1].c_str());
     EXPECT_STREQ("\"arg 2\"", exec_args[2].c_str());
 
=== modified file 'test/gtest/scopes/internal/gobj_ptr/gobj_ptr_test.cpp'
--- test/gtest/scopes/internal/gobj_ptr/gobj_ptr_test.cpp	2016-03-15 04:43:56 +0000
+++ test/gtest/scopes/internal/gobj_ptr/gobj_ptr_test.cpp	2016-11-28 10:48:16 +0000
@@ -22,7 +22,11 @@
 
 #include <unity/scopes/internal/gobj_memory.h>
 #include <glib-object.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity::scopes::internal;
@@ -87,17 +91,17 @@
 TEST(Gobj_ptr, refcount)
 {
     GObject* o = G_OBJECT(g_object_new(G_TYPE_OBJECT, nullptr));
-    EXPECT_EQ(1, o->ref_count);
+    EXPECT_EQ(1u, o->ref_count);
     g_object_ref(o);
 
     {
-        EXPECT_EQ(2, o->ref_count);
+        EXPECT_EQ(2u, o->ref_count);
         gobj_ptr<GObject> u(o);
-        EXPECT_EQ(2, o->ref_count);
+        EXPECT_EQ(2u, o->ref_count);
         // Now it dies and refcount is reduced.
     }
 
-    EXPECT_EQ(1, o->ref_count);
+    EXPECT_EQ(1u, o->ref_count);
     g_object_unref(o);
 }
 
@@ -105,14 +109,14 @@
 {
     GObject* o = G_OBJECT(g_object_new(G_TYPE_OBJECT, nullptr));
     gobj_ptr<GObject> u(o);
-    EXPECT_EQ(1, u->ref_count);
+    EXPECT_EQ(1u, u->ref_count);
     gobj_ptr<GObject> u2(u);
-    EXPECT_EQ(2, u->ref_count);
+    EXPECT_EQ(2u, u->ref_count);
     gobj_ptr<GObject> u3 = u2;
-    EXPECT_EQ(3, u->ref_count);
+    EXPECT_EQ(3u, u->ref_count);
     u3.reset();
     u2.reset();
-    EXPECT_EQ(1, u->ref_count);
+    EXPECT_EQ(1u, u->ref_count);
 }
 
 TEST(Gobj_ptr, swap)
 
=== modified file 'test/gtest/scopes/internal/safe_strerror/safe_strerror_test.cpp'
--- test/gtest/scopes/internal/safe_strerror/safe_strerror_test.cpp	2014-11-17 01:29:26 +0000
+++ test/gtest/scopes/internal/safe_strerror/safe_strerror_test.cpp	2016-11-28 10:48:16 +0000
@@ -17,7 +17,11 @@
  */
 
 #include <unity/scopes/internal/safe_strerror.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace unity::scopes::internal;
 
 
=== modified file 'test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp'
--- test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp	2015-01-16 06:13:57 +0000
+++ test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,11 @@
 
 #include "../RaiiServer.h"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <memory>
 #include <thread>
 
 
=== modified file 'test/gtest/scopes/internal/smartscopes/SSConfig/SSConfig_test.cpp'
--- test/gtest/scopes/internal/smartscopes/SSConfig/SSConfig_test.cpp	2014-07-25 07:29:19 +0000
+++ test/gtest/scopes/internal/smartscopes/SSConfig/SSConfig_test.cpp	2016-11-28 10:48:16 +0000
@@ -21,7 +21,10 @@
 #include <unity/scopes/ScopeExceptions.h>
 #include <unity/UnityExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity;
 
=== modified file 'test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp'
--- test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp	2016-03-14 07:24:54 +0000
+++ test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp	2016-11-28 10:48:16 +0000
@@ -29,7 +29,11 @@
 
 #include "../RaiiServer.h"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <memory>
 #include <thread>
 
@@ -84,7 +88,7 @@
 
     // first try an invalid locale (should throw)
     EXPECT_THROW(ssc_->get_remote_scopes(scopes, "test_FAIL", false), std::exception);
-    ASSERT_EQ(0, scopes.size());
+    ASSERT_EQ(0u, scopes.size());
 
     // now try an empty locale
     EXPECT_TRUE(ssc_->get_remote_scopes(scopes, "", false));
@@ -165,7 +169,7 @@
         params = vm["parameters"].get_dict();
         EXPECT_TRUE(params["defaultValue"].get_bool());
     }
-    ASSERT_EQ(4, scopes[2].keywords.size());
+    ASSERT_EQ(4u, scopes[2].keywords.size());
     EXPECT_NE(scopes[2].keywords.end(), scopes[2].keywords.find("music"));
     EXPECT_NE(scopes[2].keywords.end(), scopes[2].keywords.find("video"));
     EXPECT_NE(scopes[2].keywords.end(), scopes[2].keywords.find("news"));
@@ -265,27 +269,27 @@
 
     // check filters
     EXPECT_FALSE(filters.empty());
-    EXPECT_EQ(filters.size(), 1);
+    EXPECT_EQ(1u, filters.size());
     auto filter1 = filters.front();
     auto option_filter = std::dynamic_pointer_cast<const OptionSelectorFilter>(filter1);
     EXPECT_TRUE(option_filter != nullptr);
-    EXPECT_EQ(option_filter->label(), "Label");
-    EXPECT_EQ(option_filter->id(), "sorting_primary_filter");
-    EXPECT_EQ(option_filter->display_hints(), FilterBase::DisplayHints::Primary);
-    EXPECT_EQ(option_filter->multi_select(), false);
+    EXPECT_EQ("Label", option_filter->label());
+    EXPECT_EQ("sorting_primary_filter", option_filter->id());
+    EXPECT_EQ(FilterBase::DisplayHints::Primary, option_filter->display_hints());
+    EXPECT_FALSE(option_filter->multi_select());
 
     auto options = option_filter->options();
-    EXPECT_EQ(options.size(), 3);
-    EXPECT_EQ(options.front()->id(), "titlerank");
-    EXPECT_EQ(options.front()->label(), "Title rank");
-    EXPECT_EQ(options.back()->id(), "salesrank");
-    EXPECT_EQ(options.back()->label(), "Bestselling");
+    EXPECT_EQ(3u, options.size());
+    EXPECT_EQ("titlerank", options.front()->id());
+    EXPECT_EQ("Title rank", options.front()->label());
+    EXPECT_EQ("salesrank", options.back()->id());
+    EXPECT_EQ("Bestselling", options.back()->label());
 
     EXPECT_TRUE(option_filter->has_active_option(filter_state));
     auto active_options = option_filter->active_options(filter_state);
     EXPECT_FALSE(active_options.empty());
     auto active_option = *(active_options.begin());
-    EXPECT_EQ(active_option->id(), "salesrank");
+    EXPECT_EQ("salesrank", active_option->id());
 }
 
 TEST_F(SmartScopesClientTest, filter_groups)
@@ -326,7 +330,7 @@
 
     // check filters
     EXPECT_FALSE(filters.empty());
-    EXPECT_EQ(filters.size(), 1);
+    EXPECT_EQ(1u, filters.size());
     auto filter1 = filters.front();
     auto option_filter = std::dynamic_pointer_cast<const OptionSelectorFilter>(filter1);
     EXPECT_TRUE(option_filter != nullptr);
@@ -334,19 +338,19 @@
     EXPECT_TRUE(grp != nullptr);
     EXPECT_EQ("g1", grp->id());
     EXPECT_EQ("Group 1", grp->label());
-    EXPECT_EQ(option_filter->label(), "Label");
-    EXPECT_EQ(option_filter->id(), "sorting_primary_filter");
-    EXPECT_EQ(option_filter->display_hints(), FilterBase::DisplayHints::Primary);
-    EXPECT_EQ(option_filter->multi_select(), false);
+    EXPECT_EQ("Label", option_filter->label());
+    EXPECT_EQ("sorting_primary_filter", option_filter->id());
+    EXPECT_EQ(FilterBase::DisplayHints::Primary, option_filter->display_hints());
+    EXPECT_FALSE(option_filter->multi_select());
 
     auto options = option_filter->options();
-    EXPECT_EQ(options.size(), 2);
+    EXPECT_EQ(2u, options.size());
 
     EXPECT_TRUE(option_filter->has_active_option(filter_state));
     auto active_options = option_filter->active_options(filter_state);
     EXPECT_FALSE(active_options.empty());
     auto active_option = *(active_options.begin());
-    EXPECT_EQ(active_option->id(), "salesrank");
+    EXPECT_EQ("salesrank", active_option->id());
 }
 
 TEST_F(SmartScopesClientTest, userAgentHeader)
 
=== modified file 'test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp'
--- test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2015-04-29 17:01:02 +0000
+++ test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2016-11-28 10:48:16 +0000
@@ -32,7 +32,11 @@
 #include "../RaiiServer.h"
 
 #include <memory>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace testing;
 using namespace unity::scopes;
@@ -136,15 +140,15 @@
         EXPECT_EQ("Dummy demo scope 3.", meta.description());
         EXPECT_EQ("Mr.Fake", meta.author());
         EXPECT_FALSE(meta.invisible());
-        EXPECT_EQ(4, meta.settings_definitions().size());
+        EXPECT_EQ(4u, meta.settings_definitions().size());
         EXPECT_EQ("unitTemp", meta.settings_definitions()[1].get_dict()["id"].get_string());
         EXPECT_EQ("Temperature Units", meta.settings_definitions()[1].get_dict()["displayName"].get_string());
         EXPECT_EQ("list", meta.settings_definitions()[1].get_dict()["type"].get_string());
         EXPECT_EQ(1, meta.settings_definitions()[1].get_dict()["defaultValue"].get_int());
-        EXPECT_EQ(2, meta.settings_definitions()[1].get_dict()["displayValues"].get_array().size());
+        EXPECT_EQ(2u, meta.settings_definitions()[1].get_dict()["displayValues"].get_array().size());
         EXPECT_EQ("Celsius", meta.settings_definitions()[1].get_dict()["displayValues"].get_array()[0].get_string());
         EXPECT_EQ("Fahrenheit", meta.settings_definitions()[1].get_dict()["displayValues"].get_array()[1].get_string());
-        ASSERT_EQ(4, meta.keywords().size());
+        ASSERT_EQ(4u, meta.keywords().size());
         EXPECT_NE(meta.keywords().end(), meta.keywords().find("music"));
         EXPECT_NE(meta.keywords().end(), meta.keywords().find("video"));
         EXPECT_NE(meta.keywords().end(), meta.keywords().find("news"));
@@ -176,12 +180,12 @@
         EXPECT_EQ("Dummy demo scope 3.", meta.description());
         EXPECT_EQ("Mr.Fake", meta.author());
         EXPECT_FALSE(meta.invisible());
-        EXPECT_EQ(4, meta.settings_definitions().size());
+        EXPECT_EQ(4u, meta.settings_definitions().size());
         EXPECT_EQ("unitTemp", meta.settings_definitions()[1].get_dict()["id"].get_string());
         EXPECT_EQ("Temperature Units", meta.settings_definitions()[1].get_dict()["displayName"].get_string());
         EXPECT_EQ("list", meta.settings_definitions()[1].get_dict()["type"].get_string());
         EXPECT_EQ(1, meta.settings_definitions()[1].get_dict()["defaultValue"].get_int());
-        EXPECT_EQ(2, meta.settings_definitions()[1].get_dict()["displayValues"].get_array().size());
+        EXPECT_EQ(2u, meta.settings_definitions()[1].get_dict()["displayValues"].get_array().size());
         EXPECT_EQ("Celsius", meta.settings_definitions()[1].get_dict()["displayValues"].get_array()[0].get_string());
         EXPECT_EQ("Fahrenheit", meta.settings_definitions()[1].get_dict()["displayValues"].get_array()[1].get_string());
     }
@@ -192,7 +196,7 @@
     // set an invalid LANGUAGE env var (should return 0 scopes)
     ::setenv("LANGUAGE", "test_FAIL", 1);
     reset_reg();
-    EXPECT_EQ(0, reg_->list().size());
+    EXPECT_EQ(0u, reg_->list().size());
 
     // set an empty LANGUAGE env var (should return 2 scopes)
     ::setenv("LANGUAGE", "", 1);
@@ -217,7 +221,7 @@
     // set a colon seperated LANGUAGE env var (first invalid - should return 0 scopes)
     ::setenv("LANGUAGE", "test_FAIL:test_TEST", 1);
     reset_reg();
-    EXPECT_EQ(0, reg_->list().size());
+    EXPECT_EQ(0u, reg_->list().size());
 }
 
 class Receiver : public SearchListenerBase
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/ConnectionPool/ConnectionPool_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/ConnectionPool/ConnectionPool_test.cpp	2014-10-09 00:49:02 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ConnectionPool/ConnectionPool_test.cpp	2016-11-28 10:48:16 +0000
@@ -20,7 +20,10 @@
 
 #include <zmqpp/context.hpp>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity::scopes::internal::zmq_middleware;
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp	2014-11-18 07:04:04 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp	2016-11-28 10:48:16 +0000
@@ -30,7 +30,11 @@
 
 #include <boost/regex.hpp>  // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
 #include <capnp/serialize.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity;
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp	2014-11-18 07:04:04 +0000
+++ test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp	2016-11-28 10:48:16 +0000
@@ -20,7 +20,11 @@
 #include <unity/scopes/internal/zmq_middleware/ZmqMiddleware.h>
 #include <unity/scopes/ScopeExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <condition_variable>
 #include <mutex>
 
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2016-02-22 00:19:46 +0000
+++ test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2016-11-28 10:48:16 +0000
@@ -52,7 +52,10 @@
 
 #pragma pop_macro("BOOST_RANGE_ENABLE_CONCEPT_ASSERT")
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <array>
 #include <cassert>
@@ -459,7 +462,7 @@
     pid_t only_child_pid()
     {
         auto pids = child_pids();
-        EXPECT_EQ(1, pids.size()) << "Expected to find a single child process";
+        EXPECT_EQ(1u, pids.size()) << "Expected to find a single child process";
         return pids[0];
     }
 
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp	2014-11-18 07:04:04 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp	2016-11-28 10:48:16 +0000
@@ -22,7 +22,10 @@
 #include <unity/scopes/internal/zmq_middleware/ObjectAdapter.h>
 #include <unity/UnityExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <cassert>
 
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/StopPublisher/StopPublisher_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/StopPublisher/StopPublisher_test.cpp	2014-04-14 23:47:33 +0000
+++ test/gtest/scopes/internal/zmq_middleware/StopPublisher/StopPublisher_test.cpp	2016-11-28 10:48:16 +0000
@@ -20,7 +20,10 @@
 #include <unity/scopes/ScopeExceptions.h>
 #include <zmqpp/poller.hpp>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity::scopes;
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/Util/Util_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/Util/Util_test.cpp	2014-08-28 00:20:56 +0000
+++ test/gtest/scopes/internal/zmq_middleware/Util/Util_test.cpp	2016-11-28 10:48:16 +0000
@@ -22,7 +22,11 @@
 #include <unity/scopes/ScopeExceptions.h>
 
 #include <sys/un.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity;
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/VariantConverter/VariantConverter_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/VariantConverter/VariantConverter_test.cpp	2015-03-30 15:58:45 +0000
+++ test/gtest/scopes/internal/zmq_middleware/VariantConverter/VariantConverter_test.cpp	2016-11-28 10:48:16 +0000
@@ -20,8 +20,12 @@
 #include <scopes/internal/zmq_middleware/capnproto/ValueDict.capnp.h>
 #include <unity/UnityExceptions.h>
 
+#include <capnp/message.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
-#include <capnp/message.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity;
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp	2015-05-29 12:02:54 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp	2016-11-28 10:48:16 +0000
@@ -23,7 +23,10 @@
 #include <unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h>
 #include <unity/scopes/ScopeExceptions.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 using namespace std;
 using namespace unity::scopes;
 
=== modified file 'test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp'
--- test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp	2015-02-19 02:30:09 +0000
+++ test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp	2016-11-28 10:48:16 +0000
@@ -23,7 +23,11 @@
 
 #include <QtCore/QJsonObject>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <core/posix/exec.h>
 
 namespace posix = core::posix;
@@ -162,7 +166,7 @@
     }
 
     // check that we've got 5 valid results
-    EXPECT_EQ(results.size(), 5);
+    EXPECT_EQ(5u, results.size());
 }
 
 TEST_F(ExceptionsTest, check_xml_bad_formed)
 
=== modified file 'test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp'
--- test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp	2015-02-19 02:30:09 +0000
+++ test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp	2016-11-28 10:48:16 +0000
@@ -23,7 +23,10 @@
 #include <QtCore/QXmlStreamReader>
 #include <QtCore/QJsonObject>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <core/posix/exec.h>
 
 
=== modified file 'test/gtest/scopes/qt/qt-bindings/QActionMetadata_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QActionMetadata_test.cpp	2015-02-19 02:30:09 +0000
+++ test/gtest/scopes/qt/qt-bindings/QActionMetadata_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,10 @@
  * Authored by: Xavi Garcia <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <unity/scopes/qt/QActionMetadata.h>
 
 
=== modified file 'test/gtest/scopes/qt/qt-bindings/QCannedQuery_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QCannedQuery_test.cpp	2015-02-24 02:11:17 +0000
+++ test/gtest/scopes/qt/qt-bindings/QCannedQuery_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,10 @@
  * Authored by: Xavi Garcia <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <unity/scopes/qt/QCannedQuery.h>
 #include <unity/scopes/qt/internal/QCannedQueryImpl.h>
@@ -49,7 +52,7 @@
 
     unity::scopes::VariantMap api_map = api_query->serialize();
     QVariantMap qt_map = query.serialize();
-    EXPECT_EQ(api_map.size(), qt_map.size());
+    EXPECT_EQ(int(api_map.size()), qt_map.size());
     EXPECT_TRUE(qt_map.size() != 0);
     EXPECT_EQ(variantmap_to_qvariantmap(api_map), qt_map);
 
 
=== modified file 'test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp	2015-02-25 12:37:03 +0000
+++ test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,10 @@
  * Authored by: Xavi Garcia <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <unity/scopes/qt/QCategorisedResult.h>
 #include <unity/scopes/qt/QCategory.h>
 
=== modified file 'test/gtest/scopes/qt/qt-bindings/QColumnLayout_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QColumnLayout_test.cpp	2015-02-24 02:11:17 +0000
+++ test/gtest/scopes/qt/qt-bindings/QColumnLayout_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,10 @@
  * Authored by: Xavi Garcia <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <unity/scopes/qt/QColumnLayout.h>
 #include <unity/scopes/qt/internal/QColumnLayoutImpl.h>
@@ -50,7 +53,7 @@
     QVector<QString> retrieved_widget_ids = layout.column(0);
 
     std::vector<std::string> api_widgets = api_layout->column(0);
-    EXPECT_EQ(api_widgets.size(), retrieved_widget_ids.size());
+    EXPECT_EQ(int(api_widgets.size()), retrieved_widget_ids.size());
     EXPECT_TRUE(api_widgets.size() != 0);
     for (uint i = 0; i < api_widgets.size(); ++i)
     {
@@ -59,7 +62,7 @@
 
     retrieved_widget_ids = layout.column(1);
     api_widgets = api_layout->column(1);
-    EXPECT_EQ(api_widgets.size(), retrieved_widget_ids.size());
+    EXPECT_EQ(int(api_widgets.size()), retrieved_widget_ids.size());
     EXPECT_TRUE(api_widgets.size() != 0);
     for (uint i = 0; i < api_widgets.size(); ++i)
     {
 
=== modified file 'test/gtest/scopes/qt/qt-bindings/QDepartment_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QDepartment_test.cpp	2015-02-24 02:11:17 +0000
+++ test/gtest/scopes/qt/qt-bindings/QDepartment_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,10 @@
  * Authored by: Xavi Garcia <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <unity/scopes/qt/QCannedQuery.h>
 #include <unity/scopes/qt/QDepartment.h>
@@ -63,7 +66,7 @@
     unity::scopes::DepartmentList api_list = api_dep->subdepartments();
 
     EXPECT_TRUE(qt_list.size() != 0);
-    EXPECT_EQ(qt_list.size(), api_list.size());
+    EXPECT_EQ(qt_list.size(), int(api_list.size()));
 
     std::vector<std::string> dep_ids;
     for (auto item : api_list)
 
=== modified file 'test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp	2015-02-19 05:27:04 +0000
+++ test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,8 +16,10 @@
  * Authored by: Xavi Garcia <[e-mail]>
  */
 
-#include <gtest/gtest.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gmock/gmock.h>
+#pragma GCC diagnostic pop
 
 #include "BasicEventsChecker.h"
 #include "TestSetup.h"
 
=== modified file 'test/gtest/scopes/qt/qt-bindings/QPreviewWidget_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QPreviewWidget_test.cpp	2015-02-24 06:56:42 +0000
+++ test/gtest/scopes/qt/qt-bindings/QPreviewWidget_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,10 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <unity/scopes/qt/QPreviewWidget.h>
 #include <unity/scopes/qt/internal/QPreviewWidgetImpl.h>
 
=== modified file 'test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp	2015-02-24 04:03:22 +0000
+++ test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,9 +16,11 @@
  * Authored by: Xavi Garcia <[e-mail]>
  */
 
-#include <gtest/gtest.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gmock/gmock.h>
 #include <gmock/gmock-actions.h>
+#pragma GCC diagnostic pop
 
 #include "QMockScope.h"
 #include "QScopeBaseAPIMock.h"
 
=== modified file 'test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp	2015-02-24 04:05:51 +0000
+++ test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp	2016-11-28 10:48:16 +0000
@@ -17,7 +17,11 @@
  */
 
 #include "FakeScope.h"
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <unity/scopes/qt/QScopeBaseAPI.h>
 
 
=== modified file 'test/gtest/scopes/qt/qt-bindings/QSearchMetadata_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QSearchMetadata_test.cpp	2015-02-19 02:30:09 +0000
+++ test/gtest/scopes/qt/qt-bindings/QSearchMetadata_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,10 @@
  * Authored by: Xavi Garcia <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <unity/scopes/qt/QSearchMetadata.h>
 
 
=== modified file 'test/gtest/scopes/qt/qt-bindings/QSearchQueryBaseAPI_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QSearchQueryBaseAPI_test.cpp	2015-02-19 02:30:09 +0000
+++ test/gtest/scopes/qt/qt-bindings/QSearchQueryBaseAPI_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,8 +16,10 @@
  * Authored by: Xavi Garcia <[e-mail]>
  */
 
-#include <gtest/gtest.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gmock/gmock.h>
+#pragma GCC diagnostic pop
 
 #include "BasicEventsChecker.h"
 #include "TestSetup.h"
 
=== modified file 'test/gtest/scopes/qt/qt-bindings/QUtils_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QUtils_test.cpp	2015-02-24 02:11:17 +0000
+++ test/gtest/scopes/qt/qt-bindings/QUtils_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,10 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <unity/scopes/qt/internal/QUtils.h>
 
@@ -161,7 +164,7 @@
     qvm["string"] = "Hello";
 
     VariantMap vm = qvariantmap_to_variantmap(qvm);
-    ASSERT_EQ(2, vm.size());
+    ASSERT_EQ(2u, vm.size());
     EXPECT_EQ(42, vm["int"].get_int());
     EXPECT_EQ("Hello", vm["string"].get_string());
 }
 
=== modified file 'test/gtest/scopes/qt/qt-bindings/QVariantBuilder_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QVariantBuilder_test.cpp	2015-02-24 02:11:17 +0000
+++ test/gtest/scopes/qt/qt-bindings/QVariantBuilder_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,10 @@
  * Authored by: Xavi Garcia <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <unity/scopes/qt/QVariantBuilder.h>
 #include <unity/scopes/qt/internal/QVariantBuilderImpl.h>
 
=== modified file 'test/gtest/scopes/stress/scopes-stress.cpp'
--- test/gtest/scopes/stress/scopes-stress.cpp	2014-10-24 17:59:48 +0000
+++ test/gtest/scopes/stress/scopes-stress.cpp	2016-11-28 10:48:16 +0000
@@ -18,7 +18,11 @@
 
 // You may also include individual headers if you prefer.
 #include <unity-scopes.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <boost/filesystem.hpp>
 #include <condition_variable>
@@ -107,7 +111,7 @@
     RegistryProxy r = rt->registry();
 
     auto scopes_meta = r->list();
-    EXPECT_EQ(scopes_meta.size(), 3);
+    EXPECT_EQ(3u, scopes_meta.size());
 
     const std::list<std::string> scopes {"scope1", "scope2", "scope3"};
 
@@ -131,7 +135,7 @@
         {
             reply->wait_until_finished();
             cout << "finished query for scope " << reply->scope_id() << endl;
-            EXPECT_EQ(reply->result_count(), 20u);
+            EXPECT_EQ(20, reply->result_count());
         }
     }
 }
 
=== modified file 'test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp'
--- test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp	2015-01-28 09:03:59 +0000
+++ test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp	2016-11-28 10:48:16 +0000
@@ -32,7 +32,10 @@
 
 #include <unity/scopes/CategoryRenderer.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "scope.h"
 
 
=== modified file 'test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp'
--- test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp	2014-08-01 14:31:16 +0000
+++ test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp	2016-11-28 10:48:16 +0000
@@ -26,7 +26,10 @@
 
 #include <unity/scopes/CategoryRenderer.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "config.h"
 #include "scope.h"
 
=== modified file 'test/gtest/scopes/testing/Statistics/Statistics_test.cpp'
--- test/gtest/scopes/testing/Statistics/Statistics_test.cpp	2014-08-28 00:20:56 +0000
+++ test/gtest/scopes/testing/Statistics/Statistics_test.cpp	2016-11-28 10:48:16 +0000
@@ -19,7 +19,10 @@
 #include <unity/scopes/testing/Benchmark.h>
 #include <unity/scopes/testing/Statistics.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include "config.h"
 
 
=== modified file 'test/gtest/scopes/utility/BufferedResultForwarder/BufferedResultForwarder_test.cpp'
--- test/gtest/scopes/utility/BufferedResultForwarder/BufferedResultForwarder_test.cpp	2014-12-01 01:51:38 +0000
+++ test/gtest/scopes/utility/BufferedResultForwarder/BufferedResultForwarder_test.cpp	2016-11-28 10:48:16 +0000
@@ -16,7 +16,11 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
+
 #include <unity/scopes/utility/BufferedResultForwarder.h>
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/testing/MockSearchReply.h>