Windows workaround

Author: mateuszpn

unified-runtime/source/common/logger/ur_logger.hpp

@@ -33,11 +33,12 @@ inline void init(const std::string &name) { get_logger(name.c_str()); }
 // use log level as a first parameter
 // available levels: QUIET, ERR, WARN, INFO, DEBUG
 #define UR_LOG(level, ...) URLOG_(::logger::get_logger(), level, __VA_ARGS__)
-#define UR_LOG_LEGACY(level, ...) URLOG_L_(::logger::get_logger(), level, __VA_ARGS__)
 
 // TODO: consider removing UR_LOG_L and maybe UR_LOG_LEGACY macros, using UR_LOG
 // instead
-#define UR_LOG_L(...) URLOG_(__VA_ARGS__)
+#define UR_LOG_LEGACY(level, ...)                                              \
+  URLOG_L_(::logger::get_logger(), level, legacy_message, __VA_ARGS__)
+#define UR_LOG_L(logger, level, ...) URLOG_(logger, level, __VA_ARGS__)
 
 inline void setLevel(ur_logger_level_t level) { get_logger().setLevel(level); }
 

unified-runtime/source/common/logger/ur_logger_details.hpp

@@ -142,16 +142,16 @@ class Logger {
 #define URLOG_QUIET(logger_instance, ...)                                      \
   URLOG2_(logger_instance, UR_LOGGER_LEVEL_QUIET, __VA_ARGS__)
 
-#define URLOG_L_ERR(logger_instance, ...)                                      \
-  URLOG_L2_(logger_instance, UR_LOGGER_LEVEL_ERROR, __VA_ARGS__)
-#define URLOG_L_WARN(logger_instance, ...)                                     \
-  URLOG_L2_(logger_instance, UR_LOGGER_LEVEL_WARN, __VA_ARGS__)
-#define URLOG_L_DEBUG(logger_instance, ...)                                    \
-  URLOG_L2_(logger_instance, UR_LOGGER_LEVEL_DEBUG, __VA_ARGS__)
-#define URLOG_L_INFO(logger_instance, ...)                                     \
-  URLOG_L2_(logger_instance, UR_LOGGER_LEVEL_INFO, __VA_ARGS__)
-#define URLOG_L_QUIET(logger_instance, ...)                                    \
-  URLOG_L2_(logger_instance, UR_LOGGER_LEVEL_QUIET, __VA_ARGS__)
+#define URLOG_L_ERR(logger_instance, legacy_message, ...)                      \
+  URLOG_L2_(logger_instance, UR_LOGGER_LEVEL_ERROR, legacy_message, __VA_ARGS__)
+#define URLOG_L_WARN(logger_instance, legacy_message, ...)                     \
+  URLOG_L2_(logger_instance, UR_LOGGER_LEVEL_WARN, legacy_message, __VA_ARGS__)
+#define URLOG_L_DEBUG(logger_instance, legacy_message, ...)                    \
+  URLOG_L2_(logger_instance, UR_LOGGER_LEVEL_DEBUG, legacy_message, __VA_ARGS__)
+#define URLOG_L_INFO(logger_instance, legacy_message, ...)                     \
+  URLOG_L2_(logger_instance, UR_LOGGER_LEVEL_INFO, legacy_message, __VA_ARGS__)
+#define URLOG_L_QUIET(logger_instance, legacy_message, ...)                    \
+  URLOG_L2_(logger_instance, UR_LOGGER_LEVEL_QUIET, legacy_message, __VA_ARGS__)
 
 #define URLOG_(logger_instance, level, ...)                                    \
   URLOG_##level(logger_instance, __VA_ARGS__)