diff options
| author | Pawel Wasowski <p.wasowski2@samsung.com> | 2019-12-27 16:56:00 +0100 |
|---|---|---|
| committer | Pawel Wasowski <p.wasowski2@samsung.com> | 2020-01-03 14:52:18 +0000 |
| commit | 925f55d8733242e6887e9dba27908bb71d2d4b8b (patch) | |
| tree | 4337dd7423e8dc3fd060e5bb3aff17e2c6298f04 | |
| parent | 6454ce839faf0f3e32a9290ced85e1679cd00e3d (diff) | |
| download | webapi-plugins-925f55d8733242e6887e9dba27908bb71d2d4b8b.tar.gz webapi-plugins-925f55d8733242e6887e9dba27908bb71d2d4b8b.tar.bz2 webapi-plugins-925f55d8733242e6887e9dba27908bb71d2d4b8b.zip | |
Resolve compilation build problems occurring after switch to GCC 9
Build status:
Standard:
armv7l: builds successfully
aarch64: builds successfully
i586: builds successfully
x86_64: builds successfully
Emulator:
i586: builds successfully
x86_64: builds successfully
Change-Id: Iebb8423fbfae40e3c84f9e78b283163b97b8001b
Signed-off-by: Pawel Wasowski <p.wasowski2@samsung.com>
| -rw-r--r-- | src/application/application_utils.cc | 1 | ||||
| -rw-r--r-- | src/common/common.gypi | 1 | ||||
| -rw-r--r-- | src/content/content_manager.cc | 2 | ||||
| -rw-r--r-- | src/content/content_manager.h | 2 | ||||
| -rw-r--r-- | src/nfc/nfc_adapter.h | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/src/application/application_utils.cc b/src/application/application_utils.cc index 7705f1fb..b88e168e 100644 --- a/src/application/application_utils.cc +++ b/src/application/application_utils.cc @@ -17,6 +17,7 @@ #include "application_utils.h" #include <memory> +#include <functional> #include <app_manager.h> diff --git a/src/common/common.gypi b/src/common/common.gypi index 931846ce..68ca831c 100644 --- a/src/common/common.gypi +++ b/src/common/common.gypi @@ -84,6 +84,7 @@ '-Wall', '-Werror', '-Wformat-signedness', + '-Wno-psabi' # suppress messages about ABI changes in GCC 7.1 ], 'cflags_c': [ '-std=c11', diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc index c3bba863..f7f50646 100644 --- a/src/content/content_manager.cc +++ b/src/content/content_manager.cc @@ -1402,7 +1402,7 @@ media_playlist_h getPlaylistHandle(int id) { return playlist_handle; } -void destroyMediaPlaylistHandle(media_playlist_h& playlist_handle) { +void destroyMediaPlaylistHandle(media_playlist_h playlist_handle) { ScopeLogger(); if (playlist_handle) { int ret_code = media_playlist_destroy(playlist_handle); diff --git a/src/content/content_manager.h b/src/content/content_manager.h index bf04eed0..a36ebef0 100644 --- a/src/content/content_manager.h +++ b/src/content/content_manager.h @@ -32,7 +32,7 @@ namespace extension { namespace content { -typedef std::unique_ptr<std::remove_pointer<media_playlist_h>::type, void (*)(media_playlist_h&)> +typedef std::unique_ptr<std::remove_pointer<media_playlist_h>::type, void (*)(media_playlist_h)> PlaylistUniquePtr; void ContentToJson(media_info_h info, picojson::object& o); diff --git a/src/nfc/nfc_adapter.h b/src/nfc/nfc_adapter.h index 8e7c1b04..b39dc674 100644 --- a/src/nfc/nfc_adapter.h +++ b/src/nfc/nfc_adapter.h @@ -22,6 +22,7 @@ #endif #include <network/nfc.h> +#include <functional> #include <list> #include <memory> |