Two more tweaks.

Constexpr and missing concept.
wilx · Dec 30, 2023 · 1edc6e3 · 1edc6e3
1 parent cba7a7c
commit 1edc6e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/include/log4cplus/helpers/stringhelper.h b/include/log4cplus/helpers/stringhelper.h
@@ -138,7 +138,7 @@ namespace log4cplus {
         };
 
 
-        template <typename intType, typename charType>
+        template <std::integral intType, typename charType>
         struct ConvertIntegerToStringHelper<intType, charType, false>
         {
             static inline

diff --git a/src/property.cxx b/src/property.cxx
@@ -225,10 +225,10 @@ substVars (tstring & dest, const tstring & val,
     helpers::Properties const & props, helpers::LogLog& loglog,
     unsigned flags)
 {
-    static tchar const DELIM_START[] = LOG4CPLUS_TEXT("${");
-    static tchar const DELIM_STOP[] = LOG4CPLUS_TEXT("}");
-    static std::size_t const DELIM_START_LEN = 2;
-    static std::size_t const DELIM_STOP_LEN = 1;
+    tchar constexpr DELIM_START[] = LOG4CPLUS_TEXT("${");
+    tchar constexpr DELIM_STOP[] = LOG4CPLUS_TEXT("}");
+    std::size_t constexpr DELIM_START_LEN = 2;
+    std::size_t constexpr DELIM_STOP_LEN = 1;
 
     tstring::size_type i = 0;
     tstring::size_type var_start, var_end;