Make FRCUsageReporting.h C-compatible (#2070)

Now that HAL_Report has been moved into FRCUsageReporting.h,
this should also be C-compatible.

This also removes the C++ ifdef guard in HAL.h.
This commit is contained in:
David Vo
2019-11-12 16:38:24 +11:00
committed by Peter Johnson
parent d748c67a54
commit f04d95e50f
2 changed files with 3 additions and 4 deletions

View File

@@ -42,6 +42,7 @@ int64_t HAL_Report(int32_t resource, int32_t instanceNumber, int32_t context,
* Autogenerated file! Do not manually edit this file.
*/
#ifdef __cplusplus
namespace HALUsageReporting {
typedef enum {
${usage_reporting_types_cpp}
@@ -50,3 +51,4 @@ ${usage_reporting_types_cpp}
${usage_reporting_instances_cpp}
} tInstances;
}
#endif

View File

@@ -24,6 +24,7 @@
#include "hal/DriverStation.h"
#include "hal/Encoder.h"
#include "hal/Errors.h"
#include "hal/FRCUsageReporting.h"
#include "hal/HALBase.h"
#include "hal/I2C.h"
#include "hal/Interrupts.h"
@@ -41,7 +42,3 @@
#include "hal/Threads.h"
#include "hal/Types.h"
#include "hal/Value.h"
#ifdef __cplusplus
#include "hal/FRCUsageReporting.h"
#endif