Skip to content

Commit 132974d

Browse files
committed
Removed arx libs and replaced some c++11 ifdefs
1 parent c3321fd commit 132974d

File tree

3 files changed

+17
-0
lines changed

3 files changed

+17
-0
lines changed

src/MsgPack/Packer.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
#ifndef HT_SERIAL_MSGPACK_PACKER_H
33
#define HT_SERIAL_MSGPACK_PACKER_H
44

5+
#ifdef ARDUINO_ARCH_ZEPHYR
6+
#define ARX_HAVE_LIBSTDCPLUSPLUS 201103L
7+
#else
58
#include <ArxTypeTraits.h>
69
#include <ArxContainer.h>
10+
#endif
11+
712
#if ARX_HAVE_LIBSTDCPLUSPLUS >= 201103L // Have libstdc++11
813
#include <vector>
914
#include <array>

src/MsgPack/Types.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,15 @@ static constexpr uint8_t INT5 = INT5_TEMP_VALUE;
2222
#define INT5 INT5
2323
#endif
2424

25+
#ifdef ARDUINO_ARCH_ZEPHYR
26+
#define ARX_HAVE_LIBSTDCPLUSPLUS 201103L
27+
#include <vector>
28+
#include <array>
29+
#include <map>
30+
#else
2531
#include <ArxTypeTraits.h>
2632
#include <ArxContainer.h>
33+
#endif
2734

2835
namespace arduino {
2936
namespace msgpack {

src/MsgPack/Unpacker.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
#ifndef HT_SERIAL_MSGPACK_UNPACKER_H
33
#define HT_SERIAL_MSGPACK_UNPACKER_H
44

5+
#ifdef ARDUINO_ARCH_ZEPHYR
6+
#define ARX_HAVE_LIBSTDCPLUSPLUS 201103L
7+
#else
58
#include <ArxTypeTraits.h>
69
#include <ArxContainer.h>
10+
#endif
11+
712
#if ARX_HAVE_LIBSTDCPLUSPLUS >= 201103L // Have libstdc++11
813
#include <vector>
914
#include <array>

0 commit comments

Comments
 (0)