Merge pull request #2449 from Simon-Janos/Re-introduce-redundant-std-move-at-return-for-old-compilers

gabime · web-flow · commit b75edfafca58 · 2022-07-27T10:10:54.000+03:00
Re-introduce std::move at return for old GCC (before version 5) inside an ifdef for e.g. CentOS 7
diff --git a/include/spdlog/pattern_formatter-inl.h b/include/spdlog/pattern_formatter-inl.h
@@ -1053,7 +1053,11 @@ SPDLOG_INLINE std::unique_ptr<formatter> pattern_formatter::clone() const
     }
     auto cloned = details::make_unique<pattern_formatter>(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters));
     cloned->need_localtime(need_localtime_);
+#if defined(__GNUC__) && __GNUC__ < 5
+    return std::move(cloned);
+#else
     return cloned;
+#endif
 }
 
 SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest)

Original file line number	Diff line number	Diff line change
`@@ -1053,7 +1053,11 @@ SPDLOG_INLINE std::unique_ptr<formatter> pattern_formatter::clone() const`
`1053`	`1053`	`}`
`1054`	`1054`	`auto cloned = details::make_unique<pattern_formatter>(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters));`
`1055`	`1055`	`cloned->need_localtime(need_localtime_);`
	`1056`	`+#if defined(__GNUC__) && __GNUC__ < 5`
	`1057`	`+ return std::move(cloned);`
	`1058`	`+#else`
`1056`	`1059`	`return cloned;`
	`1060`	`+#endif`
`1057`	`1061`	`}`
`1058`	`1062`
`1059`	`1063`	`SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest)`