Skip to content

Commit 54ff758

Browse files
committed
fix: namespace duplication handling
1 parent 74f6637 commit 54ff758

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/dxl_c/protocol.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#define pgm_read_word_near(x) (*(uint16_t*)(x))
1313
#endif
1414

15+
using namespace DYNAMIXEL;
1516

1617
// 2.0 Protocol
1718
#define DXL2_0_PACKET_IDX_HEADER_1 0

src/dxl_c/protocol.h

+2-4
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,7 @@ struct InfoBulkWriteInst_t {
9797
InfoSyncBulkBuffer_t packet;
9898
} __attribute__((packed));
9999

100-
}
101-
102-
//using namespace DYNAMIXEL; //comment out for fixed build error
100+
} // namespace DYNAMIXEL
103101

104102
#ifdef __cplusplus
105103
extern "C" {
@@ -258,7 +256,7 @@ DXLLibErrorCode_t parse_dxl_packet(InfoToParseDXLPacket_t* p_parse_packet, uint8
258256
DXLLibErrorCode_t fast_begin_parse_dxl_packet(InfoToParseDXLPacket_t* p_parse_packet,
259257
uint8_t protocol_ver);//, uint8_t* p_param_buf, uint16_t param_buf_cap, uint8_t xel_count);
260258
DXLLibErrorCode_t fast_parse_dxl_packet(InfoToParseDXLPacket_t* p_parse_packet, uint8_t recv_data,
261-
InfoSyncReadInst_t *sync_read, InfoBulkReadInst_t *bulk_read);
259+
DYNAMIXEL::InfoSyncReadInst_t *sync_read, DYNAMIXEL::InfoBulkReadInst_t *bulk_read);
262260

263261
#ifdef __cplusplus
264262
}

0 commit comments

Comments
 (0)