From 51c6fb4bbaab58bef64690b5e099aaf2323d35e1 Mon Sep 17 00:00:00 2001
From: "Timur A. Fatkhullin" <timur@sao.ru>
Date: Tue, 10 Dec 2024 17:02:22 +0300
Subject: [PATCH] fixes

---
 common/adc_spdlog.h | 14 +++++++-------
 device/adc_device.h |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/adc_spdlog.h b/common/adc_spdlog.h
index 66c60a3..dda1a4f 100644
--- a/common/adc_spdlog.h
+++ b/common/adc_spdlog.h
@@ -84,37 +84,37 @@ public:
     }
 
     template <traits::formattable... ArgTs>
-    void logCritical(std::format_string<ArgTs...> fmt, ArgTs&&... args)
+    void logCritical(spdlog::format_string_t<ArgTs...> fmt, ArgTs&&... args)
     {
         _loggerSPtr->log(spdlog::level::critical, fmt, std::forward<ArgTs>(args)...);
     }
 
-    template <traits::formattable... ArgTs>
-    void logError(std::format_string<ArgTs...> fmt, ArgTs&&... args)
+    template <typename... ArgTs>
+    void logError(spdlog::format_string_t<ArgTs...> fmt, ArgTs&&... args)
     {
         _loggerSPtr->log(spdlog::level::err, fmt, std::forward<ArgTs>(args)...);
     }
 
     template <traits::formattable... ArgTs>
-    void logWarn(std::format_string<ArgTs...> fmt, ArgTs&&... args)
+    void logWarn(spdlog::format_string_t<ArgTs...> fmt, ArgTs&&... args)
     {
         _loggerSPtr->log(spdlog::level::warn, fmt, std::forward<ArgTs>(args)...);
     }
 
     template <traits::formattable... ArgTs>
-    void logInfo(std::format_string<ArgTs...> fmt, ArgTs&&... args)
+    void logInfo(spdlog::format_string_t<ArgTs...> fmt, ArgTs&&... args)
     {
         _loggerSPtr->log(spdlog::level::info, fmt, std::forward<ArgTs>(args)...);
     }
 
     template <traits::formattable... ArgTs>
-    void logDebug(std::format_string<ArgTs...> fmt, ArgTs&&... args)
+    void logDebug(spdlog::format_string_t<ArgTs...> fmt, ArgTs&&... args)
     {
         _loggerSPtr->log(spdlog::level::debug, fmt, std::forward<ArgTs>(args)...);
     }
 
     template <traits::formattable... ArgTs>
-    void logTrace(std::format_string<ArgTs...> fmt, ArgTs&&... args)
+    void logTrace(spdlog::format_string_t<ArgTs...> fmt, ArgTs&&... args)
     {
         _loggerSPtr->log(spdlog::level::trace, fmt, std::forward<ArgTs>(args)...);
     }
diff --git a/device/adc_device.h b/device/adc_device.h
index c48da6d..12b63ab 100644
--- a/device/adc_device.h
+++ b/device/adc_device.h
@@ -157,7 +157,7 @@ public:
     template <typename... CtorArgTs>
     AdcGenericDevice& addAttribute(CtorArgTs&&... ctor_args)
     {
-        return addAttribute({std::forward<CtorArgTs>(ctor_args)...});
+        return addAttribute(AttributeT(std::forward<CtorArgTs>(ctor_args)...));
     }