mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-29 20:23:18 +00:00
msgpack-c: Upgrade to 3.1.1
Drop upstreamed patch Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
d3d751e859
commit
76093a6540
@ -1,35 +0,0 @@
|
|||||||
From a05d92ae85024d0648f69f95307a1d3e8e51109c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Sun, 1 Apr 2018 19:55:38 -0700
|
|
||||||
Subject: [PATCH] Fix -Werror=class-memaccess
|
|
||||||
|
|
||||||
Casting to void* make gcc happy since its upset about
|
|
||||||
object types and rightly so
|
|
||||||
|
|
||||||
Fixes
|
|
||||||
|
|
||||||
'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'struct msgpack::v2::object' from an array of 'const msgpack_object' {aka 'const struct msgpack_object'} [-Werror=class-memaccess]
|
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
Upstream-Status: Submitted [https://github.com/msgpack/msgpack-c/pull/659]
|
|
||||||
|
|
||||||
include/msgpack/v1/object.hpp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/include/msgpack/v1/object.hpp b/include/msgpack/v1/object.hpp
|
|
||||||
index 64da8c53..9721f705 100644
|
|
||||||
--- a/include/msgpack/v1/object.hpp
|
|
||||||
+++ b/include/msgpack/v1/object.hpp
|
|
||||||
@@ -661,7 +661,7 @@ inline object::object(const msgpack_object& o)
|
|
||||||
inline void operator<< (msgpack::object& o, const msgpack_object& v)
|
|
||||||
{
|
|
||||||
// FIXME beter way?
|
|
||||||
- std::memcpy(&o, &v, sizeof(v));
|
|
||||||
+ std::memcpy(static_cast<void*>(&o), &v, sizeof(v));
|
|
||||||
}
|
|
||||||
|
|
||||||
inline object::operator msgpack_object() const
|
|
||||||
--
|
|
||||||
2.16.3
|
|
||||||
|
|
||||||
@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \
|
|||||||
PV .= "+git${SRCPV}"
|
PV .= "+git${SRCPV}"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/msgpack/msgpack-c \
|
SRC_URI = "git://github.com/msgpack/msgpack-c \
|
||||||
file://0001-Fix-Werror-class-memaccess.patch \
|
|
||||||
"
|
"
|
||||||
SRCREV = "208595b2620cf6260ce3d6d4cf8543f13b206449"
|
# cpp-3.1.1
|
||||||
|
SRCREV = "83a82e3eb512b18d4149cabb7eb43c7e8bc081af"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user