From 8d84c58d73fa3a7b781aa6070c931d20538929ec Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 27 May 2018 15:38:19 +0200 Subject: [PATCH] express: explicitly declare defaulted Datagram copy/move ctor/assign Fixes #329 --- panda/src/express/datagram.h | 6 +++++- tests/putil/test_datagram.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/panda/src/express/datagram.h b/panda/src/express/datagram.h index 00a46ef36f..7cf50368fc 100644 --- a/panda/src/express/datagram.h +++ b/panda/src/express/datagram.h @@ -40,9 +40,13 @@ PUBLISHED: INLINE Datagram(); INLINE Datagram(const void *data, size_t size); INLINE explicit Datagram(vector_uchar data); - + Datagram(const Datagram ©) = default; + Datagram(Datagram &&from) noexcept = default; virtual ~Datagram(); + Datagram &operator = (const Datagram ©) = default; + Datagram &operator = (Datagram &&from) noexcept = default; + virtual void clear(); void dump_hex(ostream &out, unsigned int indent=0) const; diff --git a/tests/putil/test_datagram.py b/tests/putil/test_datagram.py index 47b1432368..171363109a 100644 --- a/tests/putil/test_datagram.py +++ b/tests/putil/test_datagram.py @@ -96,8 +96,8 @@ def test_iterator(datagram_small): dgi = core.DatagramIterator(dg) verify(dgi) + # This tests the copy constructor: -@pytest.mark.xfail def test_copy(datagram_small): dg, verify = datagram_small @@ -105,7 +105,7 @@ def test_copy(datagram_small): dgi = core.DatagramIterator(dg2) verify(dgi) -@pytest.mark.xfail + def test_assign(datagram_small): dg, verify = datagram_small