Merge branch 'master' of github.com:mpusz/units

This commit is contained in:
Mateusz Pusz
2021-03-19 23:31:54 +01:00

View File

@@ -20,6 +20,12 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#include "units/bits/external/hacks.h"
#if defined(UNITS_COMP_MSVC)
#pragma warning( disable : 4459 ) // Disable shadowing warning.
#endif
#include "units/format.h"
#include "units/isq/iec80000/iec80000.h"
#include "units/isq/si/si.h"