diff options
author | Ming Liu <peter.x.liu@external.atlascopco.com> | 2017-06-11 15:01:50 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-06-14 14:51:16 +0200 |
commit | f1594f7803da286f8d84075f2bbe5ff8d4a2fd69 (patch) | |
tree | dad567715761dbfb63b6d7048c6dede7fb3693de /meta-oe/recipes-devtools | |
parent | 21f7ec05e8f5f8952877e24c4b8a55822131459c (diff) | |
download | meta-openembedded-contrib-f1594f7803da286f8d84075f2bbe5ff8d4a2fd69.tar.gz |
librcf: fix a clang compiling issue
A error was observed with clang compiler, as follows:
| src/RCF/RCF.cpp:49:
| src/RCF/ClientStub.cpp:28:
| include/RCF/Future.hpp:49:26: error: 'enrol' is a private member of 'RCF::ClientStub'
it can be fixed by declaring Future as a friend class of ClientStub.
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r-- | meta-oe/recipes-devtools/librcf/librcf/0001-ClientStub.hpp-fix-a-clang-compiling-issue.patch | 35 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/librcf/librcf/0001-ClientStub.hpp-fix-a-clang-compiling-issue.patch b/meta-oe/recipes-devtools/librcf/librcf/0001-ClientStub.hpp-fix-a-clang-compiling-issue.patch new file mode 100644 index 0000000000..e949dee40e --- /dev/null +++ b/meta-oe/recipes-devtools/librcf/librcf/0001-ClientStub.hpp-fix-a-clang-compiling-issue.patch @@ -0,0 +1,35 @@ +From d78851b6f87f2472f041102d7b3726ffc009bfad Mon Sep 17 00:00:00 2001 +From: Ming Liu <peter.x.liu@external.atlascopco.com> +Date: Tue, 6 Jun 2017 05:54:20 +0200 +Subject: [PATCH] ClientStub.hpp: fix a clang compiling issue + +A error was observed with clang compiler, as follows: +| src/RCF/RCF.cpp:49: +| src/RCF/ClientStub.cpp:28: +| include/RCF/Future.hpp:49:26: error: 'enrol' is a private member of 'RCF::ClientStub' + +it can be fixed by declaring Future as a friend class of ClientStub. + +Upstream-Status: Pending + +Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> +--- + include/RCF/ClientStub.hpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/RCF/ClientStub.hpp b/include/RCF/ClientStub.hpp +index 9882cf4..8465625 100755 +--- a/include/RCF/ClientStub.hpp ++++ b/include/RCF/ClientStub.hpp +@@ -372,6 +372,8 @@ namespace RCF { + + private: + ++ template<typename U> ++ friend class Future; + friend class FutureImplBase; + + template< +-- +2.7.4 + diff --git a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb index cf0a8e7b1c..4c9683a664 100644 --- a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb +++ b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://license.txt;md5=7586a312b9e978f9d6fac9a5780d1f84" SRC_URI = "http://www.deltavsoft.com/downloads/RCF-${PV}.tar.gz \ file://0001-Add-CMake-build-files.patch \ file://aarch64-support.patch \ + file://0001-ClientStub.hpp-fix-a-clang-compiling-issue.patch \ " SRC_URI[md5sum] = "7ecb3c73f7eb66dba8790b659374f690" |