From 35d8e8ace6b401c26cefc8d381875bbaed193119 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Sun, 15 Dec 2019 10:57:07 -0800 Subject: [PATCH] minor --- src/pvaproto.h | 2 +- test/testdata.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pvaproto.h b/src/pvaproto.h index a096c80..31cabfe 100644 --- a/src/pvaproto.h +++ b/src/pvaproto.h @@ -83,7 +83,7 @@ public: struct PVXS_API FixedBuf : public Buffer { typedef Buffer base_type; - EPICS_ALWAYS_INLINE bool refill(size_t more) override final { return false; } + virtual bool refill(size_t more) override final { return false; } template constexpr FixedBuf(bool be, uint8_t(&buf)[N]) :base_type(be, buf, N) {} diff --git a/test/testdata.cpp b/test/testdata.cpp index 699f2b7..4bdae8e 100644 --- a/test/testdata.cpp +++ b/test/testdata.cpp @@ -131,7 +131,7 @@ void testDeserialize1() testOk1(!!val["timeStamp.nanoseconds"].isMarked()); testOk1(!!val["alarm.message"].isMarked()); testEq(val["value"].as(), 0u); - testEq(val["timeStamp.nanoseconds"].as(), 0xab); + testEq(val["timeStamp.nanoseconds"].as(), 0xabu); testEq(val["alarm.message"].as(), "hello world"); } @@ -271,7 +271,7 @@ void testDeserialize2() testOk1(!!val["arbitrary.sarr"].isMarked()); testEq(val["arbitrary.sarr"].as>().size(), 3u*sizeof(Value)); testEq(val["arbitrary.sarr[0]value"].as(), 0xdeadbeef); - testEq(val["arbitrary.sarr[1]value"].as(), 0x1badface); + testEq(val["arbitrary.sarr[1]value"].as(), 0x1badfaceu); testEq(val["arbitrary.sarr[2]value"].type(), TypeCode::Null); } @@ -311,7 +311,7 @@ void testDeserialize2() }); testOk1(!val["value"].isMarked()); testOk1(!!val["any"].isMarked()); - testEq(val["any"].as(), 0x600df00d); + testEq(val["any"].as(), 0x600df00du); } { @@ -336,7 +336,7 @@ void testDeserialize2() testOk1(!val["value"].isMarked()); testOk1(!!val["anya"].isMarked()); testEq(val["anya"].as>().size(), 3u*sizeof(Value)); - testEq(val["anya[0]"].as(), 0x7b); + testEq(val["anya[0]"].as(), 0x7bu); testEq(val["anya[1]q"].as(), "theq"); testEq(val["anya[2]"].type(), TypeCode::Null); }