summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Kashkarov <m.kashkarov@partner.samsung.com>2019-12-12 08:03:29 +0300
committerMikhail Kashkarov <m.kashkarov@partner.samsung.com>2019-12-12 08:49:07 +0300
commit2c2e0a16f6fb649030c615b48a0d9139257d7f3d (patch)
treeda9d6a4698bc840ea3bc9a95e93898481864d6d9
parentb4e8e40dd875264f868d21fbee8cb9e6eb75c123 (diff)
downloadkey-manager-sandbox/mkashkarov/tizen_6.0_build.tar.gz
key-manager-sandbox/mkashkarov/tizen_6.0_build.tar.bz2
key-manager-sandbox/mkashkarov/tizen_6.0_build.zip
[Tizen 6.0] Support build with GCC 9.2sandbox/mkashkarov/tizen_6.0_build
1. mgr is dependent type, not expected to be a template - so it parses as a non template and T<..> () is invalid for anything except a template: [temp.dep.type] message-service.h:101:18: error: expected primary-expression before '>' token 101 | mgr.Register<Msg>([this](const Msg & msg) { | 2. Add missing include: obj.h:33:44: error: 'function' is not a member of 'std' 33 | typedef std::unique_ptr<EVP_PKEY_CTX, std::function<void(EVP_PKEY_CTX *)>> | ^~~~~~~~ obj.h:28:1: note: 'std::function' is defined in header '<functional>'; did you forget to '#include <functional>'? 27 | #include <data-type.h> +++ |+#include <functional> Signed-off-by: Mikhail Kashkarov <m.kashkarov@partner.samsung.com>
-rw-r--r--src/manager/common/pkcs12-impl.cpp2
-rw-r--r--src/manager/crypto/sw-backend/obj.h1
-rw-r--r--src/manager/dpl/core/src/binary_queue.cpp1
-rw-r--r--src/manager/main/message-service.h2
-rw-r--r--src/manager/service/ocsp.cpp1
5 files changed, 6 insertions, 1 deletions
diff --git a/src/manager/common/pkcs12-impl.cpp b/src/manager/common/pkcs12-impl.cpp
index 100e9b5b..1d0f827b 100644
--- a/src/manager/common/pkcs12-impl.cpp
+++ b/src/manager/common/pkcs12-impl.cpp
@@ -18,6 +18,8 @@
* @version 1.0
* @brief Certificate Implmentation.
*/
+#include <functional>
+
#include <openssl/bio.h>
#include <openssl/evp.h>
#include <openssl/pkcs12.h>
diff --git a/src/manager/crypto/sw-backend/obj.h b/src/manager/crypto/sw-backend/obj.h
index 0a00734f..284ce2cb 100644
--- a/src/manager/crypto/sw-backend/obj.h
+++ b/src/manager/crypto/sw-backend/obj.h
@@ -19,6 +19,7 @@
* @version 1.0
*/
#pragma once
+#include <functional>
#include <memory>
#include <openssl/evp.h>
diff --git a/src/manager/dpl/core/src/binary_queue.cpp b/src/manager/dpl/core/src/binary_queue.cpp
index 36b174eb..c1a44c9c 100644
--- a/src/manager/dpl/core/src/binary_queue.cpp
+++ b/src/manager/dpl/core/src/binary_queue.cpp
@@ -26,6 +26,7 @@
#include <malloc.h>
#include <cstring>
#include <new>
+#include <functional>
namespace CKM {
BinaryQueue::BinaryQueue() :
diff --git a/src/manager/main/message-service.h b/src/manager/main/message-service.h
index fc36cc6d..7506582b 100644
--- a/src/manager/main/message-service.h
+++ b/src/manager/main/message-service.h
@@ -98,7 +98,7 @@ template <typename Msg>
template <typename Mgr>
void MessageService<Msg>::Register(Mgr &mgr)
{
- mgr.Register<Msg>([this](const Msg & msg) {
+ mgr.template Register<Msg>([this](const Msg & msg) {
this->AddMessage(msg);
});
}
diff --git a/src/manager/service/ocsp.cpp b/src/manager/service/ocsp.cpp
index 60cdb5b1..24176ec6 100644
--- a/src/manager/service/ocsp.cpp
+++ b/src/manager/service/ocsp.cpp
@@ -20,6 +20,7 @@
* @brief OCSP implementation.
*/
+#include <functional>
#include <string>
#include <ocsp.h>
#include <openssl/pem.h>