Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-25 01:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpimath] Move unit formatters into units library (#5358)

Browse Source
This commit is contained in:
Tyler Veness
2023-05-26 01:05:27 -07:00
committed by GitHub
parent 282c032b60
commit 51066a5a8a
7 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wpimath/src/main/native/include/units/base.h
View File

@@ -76,7 +76,7 @@
#include <locale>
#include <string>
#endif
#if !defined(UNIT_LIB_DISABLE_FMT)
#if __has_include(<fmt/format.h>) && !defined(UNIT_LIB_DISABLE_FMT)
#include <locale>
#include <string>
#include <fmt/format.h>
@@ -176,7 +176,7 @@ namespace units
* @param abbrev - abbreviated unit name, e.g. 'm'
* @note When UNIT_LIB_ENABLE_IOSTREAM isn't defined, the macro does not generate any code
*/
#if !defined(UNIT_LIB_DISABLE_FMT)
#if __has_include(<fmt/format.h>) && !defined(UNIT_LIB_DISABLE_FMT)
#define UNIT_ADD_IO(namespaceName, nameSingular, abbrev)\
}\
template <>\
@@ -2875,7 +2875,7 @@ namespace units
}
#endif
}
#if !defined(UNIT_LIB_DISABLE_FMT)
#if __has_include(<fmt/format.h>) && !defined(UNIT_LIB_DISABLE_FMT)
template <>
struct fmt::formatter<units::dimensionless::dB_t> : fmt::formatter<double>
{
@@ -3440,6 +3440,6 @@ namespace units::literals {}
using namespace units::literals;
#endif // UNIT_HAS_LITERAL_SUPPORT
#if !defined(UNIT_LIB_DISABLE_FMT)
#include "frc/fmt/Units.h"
#if __has_include(<fmt/format.h>) && !defined(UNIT_LIB_DISABLE_FMT)
#include "units/formatter.h"
#endif