From 925f55d8733242e6887e9dba27908bb71d2d4b8b Mon Sep 17 00:00:00 2001
From: Pawel Wasowski <p.wasowski2@samsung.com>
Date: Fri, 27 Dec 2019 16:56:00 +0100
Subject: [PATCH] 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>
---
 src/application/application_utils.cc | 1 +
 src/common/common.gypi               | 1 +
 src/content/content_manager.cc       | 2 +-
 src/content/content_manager.h        | 2 +-
 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 7705f1f..b88e168 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 931846c..68ca831 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 c3bba86..f7f5064 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 bf04eed..a36ebef 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 8e7c1b0..b39dc67 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>
 
-- 
2.7.4