Merge lp:~unity-api-team/unity-scopes-api/gcc-5-fixes into lp:unity-scopes-api

[Marcus Tomlinson]

Updated standards version to 3.9.6 in debian/control.
Removed copyonly from configure() calls because cmake 3.2.2 doesn't like it.
Removed g++ dependency from debian/control because bzr bd emitted a warning.

Updated standards version to 3.9.6 in debian/control.
Removed copyonly from configure() calls because cmake 3.2.2 doesn't like it.
Removed g++ dependency from debian/control because bzr bd emitted a warning.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:619
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-api-team/unity-scopes-api/gcc-5-fixes/+merge/265757/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1496/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1496/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:619
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1497/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1497/rebuild

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:619
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/628/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-wily-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-wily-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-wily-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-wily-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/628/rebuild

review: Approve (continuous-integration)

[lp:~unity-api-team/unity-scopes-api/gcc-5-fixes]

620. By Marcus Tomlinson on 2015-07-24

Reverted symbols removal

=== modified file 'debian/control'
--- debian/control	2015-05-18 13:09:19 +0000
+++ debian/control	2015-07-24 11:46:27 +0000
@@ -7,7 +7,6 @@
                dbus-test-runner,
                debhelper (>= 9),
                doxygen,
-               g++,
                google-mock,
                graphviz,
                libaccounts-glib-dev,
@@ -32,7 +31,7 @@
                valgrind,
                libnet-cpp-dev (>=1.1.0),
                python-tornado
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest
 Section: libs
 Homepage: https://launchpad.net/unity-scopes-api

=== modified file 'src/scopes/internal/SearchReplyImpl.cpp'
--- src/scopes/internal/SearchReplyImpl.cpp	2015-02-05 09:35:42 +0000
+++ src/scopes/internal/SearchReplyImpl.cpp	2015-07-24 11:46:27 +0000
@@ -223,7 +223,7 @@
     {
         // Open a temporary file for writing.
         tmp_path = mw_proxy_->mw_base()->runtime()->cache_directory() + "/" + cache_file_name + "XXXXXX";
-        auto opener = [tmp_path]()
+        auto opener = [&tmp_path]()
         {
             int tmp_fd = mkstemp(const_cast<char*>(tmp_path.c_str()));
             if (tmp_fd == -1)
@@ -232,7 +232,7 @@
             }
             return tmp_fd;
         };
-        auto closer = [tmp_path](int fd)
+        auto closer = [&tmp_path](int fd)
         {
             if (::close(fd) == -1)
             {

=== modified file 'test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt'
--- test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt	2015-05-14 02:50:35 +0000
+++ test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt	2015-07-24 11:46:27 +0000
@@ -1,19 +1,19 @@
-configure_file(complete_config.ini.in complete_config.ini copyonly)
-configure_file(mandatory_config.ini.in mandatory_config.ini copyonly)
-configure_file(ttl_small.ini.in ttl_small.ini copyonly)
-configure_file(ttl_medium.ini.in ttl_medium.ini copyonly)
-configure_file(bad_timeout.ini.in bad_timeout.ini copyonly)
-configure_file(bad_ttl.ini.in bad_ttl.ini copyonly)
-configure_file(bad_version.ini.in bad_version.ini copyonly)
-configure_file(bad_child_ids.ini.in bad_child_ids.ini copyonly)
-configure_file(empty_child_ids.ini.in empty_child_ids.ini copyonly)
-configure_file(single_child_id.ini.in single_child_id.ini copyonly)
-configure_file(bad_keywords.ini.in bad_keywords.ini copyonly)
-configure_file(empty_keywords.ini.in empty_keywords.ini copyonly)
-configure_file(single_keyword.ini.in single_keyword.ini copyonly)
-configure_file(empty_display_name.ini.in empty_display_name.ini copyonly)
-configure_file(empty_description.ini.in empty_description.ini copyonly)
-configure_file(empty_author.ini.in empty_author.ini copyonly)
+configure_file(complete_config.ini.in complete_config.ini)
+configure_file(mandatory_config.ini.in mandatory_config.ini)
+configure_file(ttl_small.ini.in ttl_small.ini)
+configure_file(ttl_medium.ini.in ttl_medium.ini)
+configure_file(bad_timeout.ini.in bad_timeout.ini)
+configure_file(bad_ttl.ini.in bad_ttl.ini)
+configure_file(bad_version.ini.in bad_version.ini)
+configure_file(bad_child_ids.ini.in bad_child_ids.ini)
+configure_file(empty_child_ids.ini.in empty_child_ids.ini)
+configure_file(single_child_id.ini.in single_child_id.ini)
+configure_file(bad_keywords.ini.in bad_keywords.ini)
+configure_file(empty_keywords.ini.in empty_keywords.ini)
+configure_file(single_keyword.ini.in single_keyword.ini)
+configure_file(empty_display_name.ini.in empty_display_name.ini)
+configure_file(empty_description.ini.in empty_description.ini)
+configure_file(empty_author.ini.in empty_author.ini)
 
 add_definitions(-DCOMPLETE_CONFIG="${CMAKE_CURRENT_BINARY_DIR}/complete_config.ini")
 add_definitions(-DMANDATORY_CONFIG="${CMAKE_CURRENT_BINARY_DIR}/mandatory_config.ini")

=== modified file 'test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2015-02-23 03:35:58 +0000
+++ test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2015-07-24 11:46:27 +0000
@@ -36,8 +36,8 @@
 #pragma push_macro("BOOST_RANGE_ENABLE_CONCEPT_ASSERT")
 
 #if BOOST_VERSION / 100000 == 1
-#    if ((BOOST_VERSION / 100) % 1000) == 57
-#        define BOOST_RANGE_ENABLE_CONCEPT_ASSERT 0  // Iterator requirements are too strict with boost 1.57.
+#    if ((BOOST_VERSION / 100) % 1000) == 57 || ((BOOST_VERSION / 100) % 1000) == 58
+#        define BOOST_RANGE_ENABLE_CONCEPT_ASSERT 0  // Iterator requirements are too strict with boost 1.57/1.58.
 #    endif
 # endif