Merge branch 'v1.x' of https://github.com/brodao2/spdlog into v1.x

.github/workflows/ci.yml

@@ -25,7 +25,8 @@ jobs:
       - uses: actions/checkout@main
       - name: Setup
         run: |
-          apt-get update && apt-get install -y curl git pkg-config libsystemd-dev
+          apt-get update          
+          apt-get install -y curl git pkg-config libsystemd-dev
           CMAKE_VERSION="3.24.2"
           curl -sSL https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh -o install-cmake.sh
           chmod +x install-cmake.sh

CMakeLists.txt

@@ -40,7 +40,7 @@ endif()
 
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-if(CMAKE_SYSTEM_NAME MATCHES "CYGWIN" OR CMAKE_SYSTEM_NAME MATCHES "MSYS")
+if(CMAKE_SYSTEM_NAME MATCHES "CYGWIN" OR CMAKE_SYSTEM_NAME MATCHES "MSYS" OR CMAKE_SYSTEM_NAME MATCHES "MINGW")
     set(CMAKE_CXX_EXTENSIONS ON)
 endif()
 

include/spdlog/details/registry-inl.h

@@ -84,6 +84,22 @@ SPDLOG_INLINE std::shared_ptr<logger> registry::get(const std::string &logger_na
     return found == loggers_.end() ? nullptr : found->second;
 }
 
+#if __cplusplus >= 201703L  // C++17
+SPDLOG_INLINE std::shared_ptr<logger> registry::get(std::string_view logger_name) {
+    std::lock_guard<std::mutex> lock(logger_map_mutex_);
+    for (const auto &[key, val] : loggers_) {
+        if (key == logger_name) {
+            return val;
+        }
+    }
+    return nullptr;
+}
+
+SPDLOG_INLINE std::shared_ptr<logger> registry::get(const char *logger_name) {
+    return get(std::string_view(logger_name));
+}
+#endif
+
 SPDLOG_INLINE std::shared_ptr<logger> registry::default_logger() {
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     return default_logger_;

include/spdlog/details/registry.h

@@ -18,6 +18,10 @@
 #include <string>
 #include <unordered_map>
 
+#if __cplusplus >= 201703L  // C++17
+    #include <string_view>
+#endif
+
 namespace spdlog {
 class logger;
 
@@ -33,6 +37,10 @@ public:
     void register_logger(std::shared_ptr<logger> new_logger);
     void initialize_logger(std::shared_ptr<logger> new_logger);
     std::shared_ptr<logger> get(const std::string &logger_name);
+#if __cplusplus >= 201703L  // C++17
+    std::shared_ptr<logger> get(std::string_view logger_name);
+    std::shared_ptr<logger> get(const char *logger_name);
+#endif
     std::shared_ptr<logger> default_logger();
 
     // Return raw ptr to the default logger.

include/spdlog/spdlog-inl.h

@@ -20,6 +20,16 @@ SPDLOG_INLINE std::shared_ptr<logger> get(const std::string &name) {
     return details::registry::instance().get(name);
 }
 
+#if __cplusplus >= 201703L  // C++17
+SPDLOG_INLINE std::shared_ptr<logger> get(std::string_view name) {
+    return details::registry::instance().get(name);
+}
+
+SPDLOG_INLINE std::shared_ptr<logger> get(const char *name) {
+    return details::registry::instance().get(name);
+}
+#endif
+
 SPDLOG_INLINE void set_formatter(std::unique_ptr<spdlog::formatter> formatter) {
     details::registry::instance().set_formatter(std::move(formatter));
 }

include/spdlog/spdlog.h

@@ -20,6 +20,10 @@
 #include <memory>
 #include <string>
 
+#if __cplusplus >= 201703L  // C++17
+    #include <string_view>
+#endif
+
 namespace spdlog {
 
 using default_factory = synchronous_factory;
@@ -50,6 +54,10 @@ SPDLOG_API void initialize_logger(std::shared_ptr<logger> logger);
 // exist.
 // example: spdlog::get("my_logger")->info("hello {}", "world");
 SPDLOG_API std::shared_ptr<logger> get(const std::string &name);
+#if __cplusplus >= 201703L  // C++17
+SPDLOG_API std::shared_ptr<logger> get(std::string_view name);
+SPDLOG_API std::shared_ptr<logger> get(const char *name);
+#endif
 
 // Set global formatter. Each sink in each logger will get a clone of this object
 SPDLOG_API void set_formatter(std::unique_ptr<spdlog::formatter> formatter);