Merge pull request #1807 from ChristianPanov/patch-1

Initializer list style consistency

include/spdlog/common-inl.h

@@ -9,11 +9,15 @@
 
 namespace spdlog {
 namespace level {
+
+#if __cplusplus >= 201402L
+constexpr
+#endif
 static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES;
 
 static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES;
 
-SPDLOG_INLINE string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT
+SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT
 {
     return level_string_views[l];
 }

include/spdlog/common.h

@@ -166,7 +166,7 @@ enum level_enum
     }
 #endif
 
-SPDLOG_API string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT;
+SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT;
 SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT;
 SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT;
 

include/spdlog/details/log_msg_buffer-inl.h

@@ -26,7 +26,9 @@ SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg_buffer &other)
     update_string_views();
 }
 
-SPDLOG_INLINE log_msg_buffer::log_msg_buffer(log_msg_buffer &&other) SPDLOG_NOEXCEPT : log_msg{other}, buffer{std::move(other.buffer)}
+SPDLOG_INLINE log_msg_buffer::log_msg_buffer(log_msg_buffer &&other) SPDLOG_NOEXCEPT 
+    : log_msg{other}
+    , buffer{std::move(other.buffer)}
 {
     update_string_views();
 }

include/spdlog/pattern_formatter-inl.h

@@ -129,7 +129,7 @@ public:
 
     void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override
     {
-        string_view_t &level_name = level::to_string_view(msg.level);
+        const string_view_t &level_name = level::to_string_view(msg.level);
         ScopedPadder p(level_name.size(), padinfo_, dest);
         fmt_helper::append_string_view(level_name, dest);
     }

include/spdlog/sinks/hourly_file_sink.h

@@ -22,7 +22,7 @@ namespace spdlog {
 namespace sinks {
 
 /*
- * Generator of Houlry log file names in format basename.YYYY-MM-DD-HH.ext
+ * Generator of Hourly log file names in format basename.YYYY-MM-DD-HH.ext
  */
 struct hourly_filename_calculator
 {
@@ -156,7 +156,7 @@ private:
             if (!ok)
             {
                 filenames_q_.push_back(std::move(current_file));
-                throw_spdlog_ex("Failed removing hourly file " + filename_to_str(old_filename), errno);
+                SPDLOG_THROW(spdlog_ex("Failed removing hourly file " + filename_to_str(old_filename), errno));
             }
         }
         filenames_q_.push_back(std::move(current_file));