From 8a26eaf4202cf9dacfb9fd6b368d273534408251 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Tue, 30 Mar 2021 14:47:05 +0200
Subject: [PATCH] fix: VS build fixed

---
 example/experimental_angle.cpp               |  5 +++++
 src/core/include/units/bits/basic_concepts.h |  1 +
 test/unit_test/runtime/fmt_units_test.cpp    | 10 ++++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/example/experimental_angle.cpp b/example/experimental_angle.cpp
index 5b7328d0..bfadba83 100644
--- a/example/experimental_angle.cpp
+++ b/example/experimental_angle.cpp
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <units/bits/external/hacks.h> // IWYU pragma: keep
 #include <units/generic/angle.h>
 #include <units/isq/si/energy.h>
 #include <units/isq/si/force.h>
@@ -28,6 +29,10 @@
 #include <units/quantity_io.h>
 #include <iostream>
 
+#if defined(UNITS_COMP_MSVC)
+#pragma warning( disable : 4459 ) // Disable shadowing warning.
+#endif
+
 int main()
 {
   using namespace units::references;
diff --git a/src/core/include/units/bits/basic_concepts.h b/src/core/include/units/bits/basic_concepts.h
index b15f3b27..4ec56115 100644
--- a/src/core/include/units/bits/basic_concepts.h
+++ b/src/core/include/units/bits/basic_concepts.h
@@ -32,6 +32,7 @@
 // IWYU pragma: end_exports
 
 #include <cstdint>
+#include <functional>
 #include <utility>
 
 namespace units {
diff --git a/test/unit_test/runtime/fmt_units_test.cpp b/test/unit_test/runtime/fmt_units_test.cpp
index 1dde0460..96c48e48 100644
--- a/test/unit_test/runtime/fmt_units_test.cpp
+++ b/test/unit_test/runtime/fmt_units_test.cpp
@@ -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> // IWYU pragma: keep
+
+#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/iau/iau.h>
@@ -30,10 +36,6 @@
 #include <units/isq/si/us/us.h>
 #include <catch2/catch.hpp>
 
-#if defined(UNITS_COMP_MSVC)
-#pragma warning( disable : 4459 ) // Disable shadowing warning.
-#endif
-
 using namespace units::isq::si;
 using namespace units::isq::si::references;
 using namespace units::isq::si::international;