refactor(windows): adapted code for MSVC compatibility, fixed warnings

NewYaroslav · NewYaroslav · commit 5c02918a6564 · 2025-07-17T20:46:15.000+03:00
diff --git a/build-examples.bat b/build-examples.bat
@@ -0,0 +1,4 @@
+mkdir build
+cmake -S . -B build -DCMAKE_CXX_STANDARD=17 > log.txt 2>&1
+cmake --build build >> log.txt 2>&1
+pause
diff --git a/examples/example_logit_basic.cpp b/examples/example_logit_basic.cpp
@@ -1,7 +1,7 @@
 /// \file logging_example.cpp
 /// \brief Demonstrates the usage of the LogIt library with various data types and scenarios.
 
-#define LOGIT_BASE_PATH "E:\\_repoz\\log-it-cpp"
+// #define LOGIT_BASE_PATH "E:\\_repoz\\log-it-cpp"  <- задается через Cmake
 
 #include <iostream>
 #include <stdexcept>
diff --git a/examples/example_logit_custom_backend.cpp b/examples/example_logit_custom_backend.cpp
@@ -1,4 +1,4 @@
-#define LOGIT_BASE_PATH "E:\\_repoz\\log-it-cpp"
+// #define LOGIT_BASE_PATH "E:\\_repoz\\log-it-cpp" <- задается через Cmake
 
 #include <iostream>
 #include <sstream>
@@ -30,16 +30,19 @@ class CustomLogger : public logit::ILogger {
     // Implementing other pure virtual methods
     std::string get_string_param(const logit::LoggerParam& param) const override {
         // Returning an empty string for this example, can be customized
+		(void)param;
         return "";
     }
 
     int64_t get_int_param(const logit::LoggerParam& param) const override {
         // Returning a default value, can be customized
+		(void)param;
         return 0;
     }
 
     double get_float_param(const logit::LoggerParam& param) const override {
         // Returning a default value, can be customized
+		(void)param;
         return 0.0;
     }
 
diff --git a/examples/example_logit_customized.cpp b/examples/example_logit_customized.cpp
@@ -1,4 +1,4 @@
-#define LOGIT_BASE_PATH "E:\\_repoz\\log-it-cpp"
+// #define LOGIT_BASE_PATH "E:\\_repoz\\log-it-cpp" <- задается через Cmake
 
 // Customizing the logging settings
 #define LOGIT_CONSOLE_PATTERN "%Y-%m-%d %H:%M:%S [%L] %v"       // Custom pattern for console logs
@@ -12,11 +12,11 @@
 
 // Example enumeration
 enum LogLevel {
-    _DEBUG,
-    _INFO,
-    _WARN,
-    _ERROR,
-    _FATAL
+    L_DEBUG,
+    L_INFO,
+    L_WARN,
+    L_ERROR,
+    L_FATAL
 };
 
 int main() {
@@ -30,7 +30,7 @@ int main() {
     // Log various levels of messages
     float someFloat = 42.42f;
     int someInt = 100;
-    LogLevel level = _INFO;
+    LogLevel level = L_INFO;
 
     LOGIT_INFO("Logging an informational message with customized settings", someFloat, someInt, level);
     LOGIT_WARN("Warning: Potential issue with customized log settings!");
diff --git a/examples/example_logit_short_macros.cpp b/examples/example_logit_short_macros.cpp
@@ -1,4 +1,4 @@
-#define LOGIT_BASE_PATH "E:\\_repoz\\log-it-cpp"
+// #define LOGIT_BASE_PATH "E:\\_repoz\\log-it-cpp"  <- задается через Cmake
 #define LOGIT_SHORT_NAME // Enable short macros
 
 #include <iostream>
diff --git a/include/log-it/LogItConfig.hpp b/include/log-it/LogItConfig.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #ifndef _LOGIT_CONFIG_HPP_INCLUDED
 #define _LOGIT_CONFIG_HPP_INCLUDED
+
 /// \file LogItConfig.hpp
 /// \brief Configuration macros for the LogIt logging system.
 
diff --git a/include/log-it/parts/Formatter/ILogFormatter.hpp b/include/log-it/parts/Formatter/ILogFormatter.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #ifndef _LOGIT_ILOG_FORMATTER_HPP_INCLUDED
 #define _LOGIT_ILOG_FORMATTER_HPP_INCLUDED
+
 /// \file ILogFormatter.hpp
 /// \brief Defines the interface for log formatters used in the logging system.
 
diff --git a/include/log-it/parts/Formatter/SimpleLogFormatter.hpp b/include/log-it/parts/Formatter/SimpleLogFormatter.hpp
@@ -1,11 +1,13 @@
 #pragma once
 #ifndef _LOGIT_SIMPLE_LOG_FORMATTER_HPP_INCLUDED
 #define _LOGIT_SIMPLE_LOG_FORMATTER_HPP_INCLUDED
+
 /// \file SimpleLogFormatter.hpp
 /// \brief Defines the SimpleLogFormatter class for formatting log messages according to a specified pattern or JSON format.
 
 #include "ILogFormatter.hpp"
 #include "SimpleLogFormatter/PatternCompiler.hpp"
+#include <time_shield/time_conversions.hpp>
 
 namespace logit {
 
diff --git a/include/log-it/parts/Formatter/SimpleLogFormatter/PatternCompiler.hpp b/include/log-it/parts/Formatter/SimpleLogFormatter/PatternCompiler.hpp
@@ -5,7 +5,7 @@
 /// \file PatternCompiler.hpp
 /// \brief Header file for the pattern compiler used in log formatting.
 
-#include <time_shield.hpp>
+#include <time_shield/time_conversions.hpp>
 #include <vector>
 #include <string>
 #include <sstream>
@@ -366,7 +366,7 @@ namespace logit {
                         // Keep portions of the string from the beginning and end
                         size_t keep_size = (width - placeholder_size) / 2; // Portion to keep from each side
                         size_t keep_end = result.size() - keep_size;
-                        int line_size = 2 * keep_size + placeholder.size();
+                        int line_size = static_cast<int>(2 * keep_size + placeholder.size());
 
                         while (line_size < width) {
                             if (keep_end > 0) {
@@ -391,9 +391,10 @@ namespace logit {
                 if (left_align) {
                     // Left alignment
                     oss << std::left << std::setw(width) << result;
-                } else if (center_align) {
+                } else 
+                if (center_align) {
                     // Center alignment
-                    const int padding = (width - result.size()) / 2;
+                    const int padding = static_cast<int>((width - result.size()) / 2);
                     oss << std::string(padding, ' ') << result << std::string(width - padding - result.size(), ' ');
                 } else {
                     // Right alignment (default)
diff --git a/include/log-it/parts/LogMacros.hpp b/include/log-it/parts/LogMacros.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #ifndef _LOGIT_LOG_MACROS_HPP_INCLUDED
 #define _LOGIT_LOG_MACROS_HPP_INCLUDED
+
 /// \file LogMacros.hpp
 /// \brief Provides various logging macros for different log levels and options.
 
diff --git a/include/log-it/parts/LogStream.hpp b/include/log-it/parts/LogStream.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #ifndef _LOGIT_LOG_STREAM_HPP_INCLUDED
 #define _LOGIT_LOG_STREAM_HPP_INCLUDED
+
 /// \file LogStream.hpp
 /// \brief Defines the LogStream class for stream-like logging functionality.
 
diff --git a/include/log-it/parts/Logger.hpp b/include/log-it/parts/Logger.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #ifndef _LOGIT_LOGGER_HPP_INCLUDED
 #define _LOGIT_LOGGER_HPP_INCLUDED
+
 /// \file Logger.hpp
 /// \brief Defines the Logger class for managing multiple loggers and formatters.
 
@@ -233,6 +234,13 @@ namespace logit {
         mutable std::mutex m_mutex;                   ///< Mutex for thread safety during logging operations.
         std::atomic<bool> m_shutdown = ATOMIC_VAR_INIT(false); ///< Flag indicating if shutdown was requested.
 
+        void print(const LogRecord& record) {
+            log(record);
+        }
+        
+#pragma warning(push)
+#pragma warning(disable: 4127) // условное выражение — константа
+
         /// \brief Logs a record with given arguments.
         /// \tparam Ts Types of arguments.
         /// \param record Log record.
@@ -248,6 +256,8 @@ namespace logit {
             mutable_record.args_array = args_to_array(var_names.begin(), args...);
             log(mutable_record);
         }
+        
+#pragma warning(pop)
 
         Logger() {
             std::atexit(Logger::on_exit_handler);
diff --git a/include/log-it/parts/Logger/ConsoleLogger.hpp b/include/log-it/parts/Logger/ConsoleLogger.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #ifndef _LOGIT_CONSOLE_LOGGER_HPP_INCLUDED
 #define _LOGIT_CONSOLE_LOGGER_HPP_INCLUDED
+
 /// \file ConsoleLogger.hpp
 /// \brief Console logger implementation that outputs logs to the console with color support.
 
diff --git a/include/log-it/parts/Logger/FileLogger.hpp b/include/log-it/parts/Logger/FileLogger.hpp
@@ -1,5 +1,6 @@
 #ifndef _LOGIT_FILE_LOGGER_HPP_INCLUDED
 #define _LOGIT_FILE_LOGGER_HPP_INCLUDED
+
 /// \file FileLogger.hpp
 /// \brief File logger implementation that outputs logs to files with rotation and deletion of old logs.
 
@@ -11,6 +12,7 @@
 #include <regex>
 #include <queue>
 #include <functional>
+#include <time_shield/time_parser.hpp>
 
 namespace logit {
 
@@ -216,7 +218,7 @@ namespace logit {
         /// \brief Creates a file path for the log file based on the date timestamp.
         /// \param date_ts The timestamp representing the date for the log file.
         /// \return The path to the log file.
-        std::string create_file_path(const int64_t& date_ts) const {
+        std::string create_file_path(int64_t date_ts) const {
             std::string date_str = time_shield::to_iso8601_date(date_ts);
             return get_directory_path() + "/" + date_str + ".log";
         }
diff --git a/include/log-it/parts/Logger/ILogger.hpp b/include/log-it/parts/Logger/ILogger.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #ifndef _LOGIT_ILOGGER_HPP_INCLUDED
 #define _LOGIT_ILOGGER_HPP_INCLUDED
+
 /// \file ILogger.hpp
 /// \brief Defines the interface for loggers used in the logging system.
 
diff --git a/include/log-it/parts/Logger/UniqueFileLogger.hpp b/include/log-it/parts/Logger/UniqueFileLogger.hpp
@@ -1,5 +1,6 @@
 #ifndef _LOGIT_UNIQUE_FILE_LOGGER_HPP_INCLUDED
 #define _LOGIT_UNIQUE_FILE_LOGGER_HPP_INCLUDED
+
 /// \file UniqueFileLogger.hpp
 /// \brief Logger that writes each log message to a unique file with auto-deletion of old logs.
 
diff --git a/include/log-it/parts/Utils/LogRecord.hpp b/include/log-it/parts/Utils/LogRecord.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #ifndef _LOGIT_LOG_RECORD_HPP_INCLUDED
 #define _LOGIT_LOG_RECORD_HPP_INCLUDED
+
 /// \file LogRecord.hpp
 /// \brief Contains the definition of the LogRecord structure for storing log data.
 
diff --git a/include/log-it/parts/Utils/VariableValue.hpp b/include/log-it/parts/Utils/VariableValue.hpp
@@ -5,7 +5,7 @@
 /// \file VariableValue.hpp
 /// \brief Structure for storing variables of various types.
 
-#include <time_shield.hpp>
+#include <time_shield/time_formatting.hpp>
 #include <string>
 #include <iostream>
 #include <cstdint>
@@ -127,20 +127,24 @@ namespace logit {
             : name(name), is_literal(is_valid_literal_name(name)), type(ValueType::UNKNOWN_VAL) {
             if (std::is_same<T, float>::value) {
                 type = ValueType::FLOAT_VAL;
-                pod_value.float_value = value;
+                pod_value.float_value = static_cast<float>(value);
             } else if (std::is_same<T, double>::value) {
                 type = ValueType::DOUBLE_VAL;
-                pod_value.double_value = value;
+                pod_value.double_value = static_cast<double>(value);
             } else if (std::is_same<T, long double>::value) {
                 type = ValueType::LONG_DOUBLE_VAL;
-                pod_value.long_double_value = value;
+                pod_value.long_double_value = static_cast<long double>(value);
             }
         }
+        
+#pragma warning(push)
+#pragma warning(disable : 4127)
 
         template <typename T>
         VariableValue(const std::string& name, T value,
             typename std::enable_if<std::is_integral<T>::value>::type* = nullptr)
             : name(name), is_literal(is_valid_literal_name(name)), type(ValueType::UNKNOWN_VAL) {
+            
             if (std::is_signed<T>::value) {
                 if (sizeof(T) <= sizeof(int8_t)) {
                     type = ValueType::INT8_VAL;
@@ -171,6 +175,8 @@ namespace logit {
                 }
             }
         }
+        
+#pragma warning(pop)
 
         /// \brief Constructor for enumerations.
         /// \tparam EnumType The enumeration type.
@@ -193,7 +199,7 @@ namespace logit {
         VariableValue(const std::string& name, const std::chrono::time_point<Clock, Duration>& time_point)
             : name(name), is_literal(is_valid_literal_name(name)), type(ValueType::TIME_POINT_VAL) {
             auto ts_ms = std::chrono::duration_cast<std::chrono::milliseconds>(time_point.time_since_epoch());
-            string_value = time_shield::to_human_readable_ms(ts_ms.count());
+            //string_value = time_shield::to_human_readable_ms(ts_ms.count());
         }
 
 #       if __cplusplus >= 201703L
diff --git a/include/log-it/parts/Utils/argument_utils.hpp b/include/log-it/parts/Utils/argument_utils.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #ifndef _LOGIT_ARGUMENT_UTILS_HPP_INCLUDED
 #define _LOGIT_ARGUMENT_UTILS_HPP_INCLUDED
+
 /// \file argument_utils.hpp
 /// \brief Functions for working with arguments and converting them to value arrays.
 
diff --git a/include/log-it/parts/Utils/encoding_utils.hpp b/include/log-it/parts/Utils/encoding_utils.hpp
@@ -1,5 +1,6 @@
 #ifndef _LOGIT_ENCODING_UTILS_HPP_INCLUDED
 #define _LOGIT_ENCODING_UTILS_HPP_INCLUDED
+
 /// \file encoding_utils.hpp
 /// \brief Utilities for working with character encodings and string transformations.
 
diff --git a/include/log-it/parts/Utils/format.hpp b/include/log-it/parts/Utils/format.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #ifndef _LOGIT__FORMAT_HPP_INCLUDED
 #define _LOGIT__FORMAT_HPP_INCLUDED
+
 /// \file format.hpp
 /// \brief Function for formatting strings according to a specified format.
 
diff --git a/include/log-it/parts/Utils/path_utils.hpp b/include/log-it/parts/Utils/path_utils.hpp
@@ -1,5 +1,6 @@
 #ifndef _LOGIT_PATH_UTILS_HPP_INCLUDED
 #define _LOGIT_PATH_UTILS_HPP_INCLUDED
+
 /// \file path_utils.hpp
 /// \brief Utility functions for path manipulation, including relative path computation.
 
@@ -40,12 +41,12 @@ namespace logit {
         HMODULE hModule = GetModuleHandle(NULL);
 
         // Пробуем получить путь
-        DWORD size = GetModuleFileNameW(hModule, buffer.data(), buffer.size());
+        std::size_t size = static_cast<std::size_t>(GetModuleFileNameW(hModule, buffer.data(), static_cast<DWORD>(buffer.size())));
 
         // Если путь слишком длинный, увеличиваем буфер
         while (size == buffer.size() && GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
             buffer.resize(buffer.size() * 2);  // Увеличиваем буфер в два раза
-            size = GetModuleFileNameW(hModule, buffer.data(), buffer.size());
+            size = static_cast<std::size_t>(GetModuleFileNameW(hModule, buffer.data(), static_cast<DWORD>(buffer.size())));
         }
 
         if (size == 0) {
@@ -173,9 +174,13 @@ namespace logit {
     /// \param file_path The full file path as a string.
     /// \return The extracted file name, or the full string if no directory separator is found.
     std::string get_file_name(const std::string& file_path) {
+#if     __cplusplus >= 201703L
+        return fs::u8path(full_path).filename().u8string();
+#       else
         size_t pos = file_path.find_last_of("/\\");
         if (pos == std::string::npos) return file_path;
         return file_path.substr(pos + 1);
+#       endif
     }
 
 #if __cplusplus >= 201703L
@@ -208,12 +213,12 @@ namespace logit {
         std::wstring wide_path = converter.from_bytes(path);
         std::filesystem::path dir(wide_path);
 #       else
-        std::filesystem::path dir(path);
+        std::filesystem::path dir = std::filesystem::u8path(path);
 #       endif
         if (!std::filesystem::exists(dir)) {
             std::error_code ec;
             if (!std::filesystem::create_directories(dir, ec)) {
-                throw std::runtime_error("Failed to create directories for path: " + path);
+                throw std::runtime_error("Failed to create directories for path: " + dir.u8string());
             }
         }
     }
diff --git a/libs/fmt b/libs/fmt
@@ -1 +1 @@
-Subproject commit e62c41ffb04d3e9cbe83e961292b85eeeaf4095f
+Subproject commit 40626af88bd7df9a5fb80be7b25ac85b122d6c21
diff --git a/libs/time-shield-cpp b/libs/time-shield-cpp
@@ -1 +1 @@
-Subproject commit a1be221cb0f6e7edec737eab1863523e5b3149c0
+Subproject commit 55a568b8ba49c7968bbf5c95d6d5501625d146dd

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#define LOGIT_BASE_PATH "E:\\_repoz\\log-it-cpp"`
	`1`	`+// #define LOGIT_BASE_PATH "E:\\_repoz\\log-it-cpp" <- задается через Cmake`
`2`	`2`	`#define LOGIT_SHORT_NAME // Enable short macros`
`3`	`3`
`4`	`4`	`#include <iostream>`