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>

diff --git a/src/application/application_utils.cc b/src/application/application_utils.cc
index 7705f1fb0e4b34a358110469d720204c3cbd92f3..b88e168eb50f9578a015151a9ff0027006c09f05 100644 (file)
--- 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 931846cea5a4437e1ac3ab77472fecdf4c00b877..68ca831c3aa6f963641a43911e0d6f481d033c63 100644 (file)
--- 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 c3bba863a812c654374cd87599af393572c6a2bb..f7f50646dd13bd8549595c1a4448f6703d5cc9f1 100644 (file)
--- 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 bf04eed0e20b74734b77a4be464f2175f44d5550..a36ebef001cfcd8908c4cb2b17ae57aa71869fb2 100644 (file)
--- 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 8e7c1b04be170f60bfa7d34ca0e582adee19344c..b39dc674565ac7486e387e670e2eecd3bebed199 100644 (file)
--- 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>