Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL: rename AP_HAL::CAN to AP_HAL::CANHal 

avoid conflict with ChibiOS STM32F3xx headers
This commit is contained in:
Andrew Tridgell 2019-10-31 21:58:27 +11:00
parent 680a89671f
commit 29a2351fd0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL/AP_HAL_Namespace.h
View File

@ -31,7 +31,7 @@ namespace AP_HAL {
class CANProtocol;
class CANManager;
class CAN;
class CANHal;
class Util;
class Flash;

2
libraries/AP_HAL/CAN.h
View File

@ -48,7 +48,7 @@ public:
/**
* Single non-blocking CAN interface.
*/
class AP_HAL::CAN: public uavcan::ICanIface {
class AP_HAL::CANHal: public uavcan::ICanIface {
public:
/* CAN port open method