diff options
| author |   Kazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp> | 2016-09-27 20:42:28 +0900 |
|---|---|---|
| committer | Kazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp> | 2016-09-27 20:42:28 +0900 |
| commit | 8f44c14ba9c648f4d49327b169b2d60616b4c05a (patch) | |
| tree | cae807b95c7e19d9f5f9a2dac24a1c871145b1ac | |
| parent | 33d118c50c6c67ac55271a0f1c0bfdf82ece5c75 (diff) | |
Fix security-manager build error
C++11 doesn't recommend to use auto_ptr.
Changed it to unique_ptr.
Signed-off-by: Kazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp>
2 files changed, 18 insertions, 1 deletions
diff --git a/meta-application-manager/recipes-others/security-server/security-server.inc b/meta-application-manager/recipes-others/security-server/security-server.inc index 90b4899..a9aefb4 100644 --- a/meta-application-manager/recipes-others/security-server/security-server.inc +++ b/meta-application-manager/recipes-others/security-server/security-server.inc @@ -4,7 +4,10 @@ SECTION = "Security/Service" LICENSE = "Apache-2.0" PV = "0.1.1" -SRC_URI = "file://0001-remove-dbus-check.patch " +SRC_URI = " \ + file://0001-remove-dbus-check.patch \ + file://replace_auto_ptr_to_unique_ptr.patch \ + " S = "${WORKDIR}/git" diff --git a/meta-application-manager/recipes-others/security-server/security-server/replace_auto_ptr_to_unique_ptr.patch b/meta-application-manager/recipes-others/security-server/security-server/replace_auto_ptr_to_unique_ptr.patch new file mode 100644 index 0000000..67107eb --- /dev/null +++ b/meta-application-manager/recipes-others/security-server/security-server/replace_auto_ptr_to_unique_ptr.patch @@ -0,0 +1,14 @@ +diff --git a/src/server/dpl/core/include/dpl/binary_queue.h b/src/server/dpl/core/include/dpl/binary_queue.h +index 387a71a..5cdfd6e 100644 +--- a/src/server/dpl/core/include/dpl/binary_queue.h ++++ b/src/server/dpl/core/include/dpl/binary_queue.h +@@ -33,7 +33,8 @@ namespace SecurityServer { + * Binary queue auto pointer + */ + class BinaryQueue; +-typedef std::auto_ptr<BinaryQueue> BinaryQueueAutoPtr; ++//typedef std::auto_ptr<BinaryQueue> BinaryQueueAutoPtr; ++typedef std::unique_ptr<BinaryQueue> BinaryQueueAutoPtr; + + /** + * Binary stream implemented as constant size bucket list |