2282: incorporate review feedback

src/driver/main.cpp

@@ -41,7 +41,6 @@
 #include <migraphx/json.hpp>
 #include <migraphx/version.h>
 
-#include <migraphx/instruction.hpp>
 #include <migraphx/dead_code_elimination.hpp>
 #include <migraphx/eliminate_identity.hpp>
 #include <migraphx/eliminate_pad.hpp>

src/include/migraphx/config.hpp

@@ -25,10 +25,7 @@
 #define MIGRAPHX_GUARD_CONFIG_HPP
 
 #include <migraphx/export.h>
-
-#if defined(_MSC_VER) && !defined(__clang__)
 #include <ciso646>
-#endif
 
 #if !defined(MIGRAPHX_USE_CLANG_TIDY) && !defined(DOXYGEN)
 

src/include/migraphx/instruction_ref.hpp

@@ -65,4 +65,8 @@ struct equal_to<migraphx::instruction_ref> // NOLINT
 
 } // namespace std
 
+#ifdef _MSC_VER
+#include <migraphx/instruction.hpp>
+#endif
+
 #endif

test/include/test.hpp

@@ -333,12 +333,14 @@ enum class color
     bg_blue    = 44,
     bg_default = 49
 };
-inline std::ostream& operator<<(std::ostream& os, [[maybe_unused]] const color& c)
+inline std::ostream& operator<<(std::ostream& os, const color& c)
 {
 #ifndef _WIN32
     static const bool use_color = isatty(STDOUT_FILENO) != 0;
     if(use_color)
         return os << "\033[" << static_cast<std::size_t>(c) << "m";
+#else
+    (void)c;
 #endif
     return os;
 }

test/promote_literals_test.cpp

@@ -26,7 +26,6 @@
 #include <migraphx/program.hpp>
 #include <migraphx/dead_code_elimination.hpp>
 #include <migraphx/eliminate_common_subexpression.hpp>
-#include <migraphx/instruction.hpp>
 #include <migraphx/pass_manager.hpp>
 #include <migraphx/make_op.hpp>
 #include <migraphx/serialize.hpp>