Merge lp:~michihenning/storage-framework/fix-compile-warnings into lp:storage-framework/devel

Proposed by Michi Henning
Status: Merged
Merged at revision: 37
Proposed branch: lp:~michihenning/storage-framework/fix-compile-warnings
Merge into: lp:storage-framework/devel
Diff against target: 27 lines (+5/-2)
2 files modified
src/provider/CMakeLists.txt (+4/-1)
src/qt/client/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~michihenning/storage-framework/fix-compile-warnings
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing
James Henstridge Approve
Review via email: mp+300831@code.launchpad.net

Commit message

Minor changes to get rid of warnings when compiling on vivid.

Description of the change

Minor changes to get rid of warnings when compiling on vivid.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:35
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/30/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/239/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/247
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/184
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/184
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/184
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/113/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/113/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/113/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/113/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/113/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/113/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/113/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/113/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/113/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:36
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/31/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/240/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/248
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/185
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/185
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/185
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/114/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/114/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/114/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/114/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/114/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/114/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/114/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/114/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/114/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good.

review: Approve
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-autoland/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/250/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/258
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/193
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/193
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/193
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/122/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/122/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/122/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/122/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/122/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/122/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/122/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/122/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/122/console

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/provider/CMakeLists.txt'
--- src/provider/CMakeLists.txt 2016-07-19 09:31:30 +0000
+++ src/provider/CMakeLists.txt 2016-07-22 03:49:04 +0000
@@ -11,7 +11,10 @@
11set_source_files_properties(bus.xml PROPERTIES CLASSNAME BusInterface)11set_source_files_properties(bus.xml PROPERTIES CLASSNAME BusInterface)
12qt5_add_dbus_interface(generated_files bus.xml businterface)12qt5_add_dbus_interface(generated_files bus.xml businterface)
1313
14set_source_files_properties(${generated_files} PROPERTIES GENERATED TRUE)14set_source_files_properties(${generated_files} PROPERTIES
15 COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wmissing-field-initializers"
16 GENERATED TRUE
17)
1518
16add_library(storage-framework-provider SHARED19add_library(storage-framework-provider SHARED
17 DownloadJob.cpp20 DownloadJob.cpp
1821
=== modified file 'src/qt/client/CMakeLists.txt'
--- src/qt/client/CMakeLists.txt 2016-07-22 00:17:24 +0000
+++ src/qt/client/CMakeLists.txt 2016-07-22 03:49:04 +0000
@@ -88,7 +88,7 @@
88 ProviderInterface88 ProviderInterface
89)89)
90set_source_files_properties(${generated_files} PROPERTIES90set_source_files_properties(${generated_files} PROPERTIES
91 COMPILE_FLAGS -Wno-ctor-dtor-privacy91 COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wmissing-field-initializers"
92 GENERATED TRUE92 GENERATED TRUE
93)93)
9494

Subscribers

People subscribed via source and target branches

to all changes: