mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-07-29 18:07:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #459 from HazardyKnusperkeks/macro

Browse Source 
Work around Windows macro
This commit is contained in:
Mateusz Pusz
2023-05-26 08:18:58 +02:00
committed by GitHub
parent 7d9ae3ec31 814b731696
commit b7e467ff42
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/systems/si/include/mp-units/systems/si/units.h
View File

@ -45,7 +45,16 @@ inline constexpr struct radian : named_unit<"rad", metre / metre, kind_of<isq::a
inline constexpr struct steradian : named_unit<"sr", square<metre> / square<metre>, kind_of<isq::solid_angular_measure>> {} steradian;
inline constexpr struct hertz : named_unit<"Hz", 1 / second, kind_of<isq::frequency>> {} hertz;
inline constexpr struct newton : named_unit<"N", kilogram * metre / square<second>> {} newton;
#ifdef pascal
#pragma push_macro("pascal")
#undef pascal
#define UNITS_REDEFINE_PASCAL
#endif
inline constexpr struct pascal : named_unit<"Pa", newton / square<metre>> {} pascal;
#ifdef UNITS_REDEFINE_PASCAL
#pragma pop_macro("pascal")
#undef UNITS_REDEFINE_PASCAL
#endif
inline constexpr struct joule : named_unit<"J", newton * metre> {} joule;
inline constexpr struct watt : named_unit<"W", joule / second> {} watt;
inline constexpr struct coulomb : named_unit<"C", ampere * second> {} coulomb;