Roll micro release, and minor touchups on #19

eddelbuettel · Oct 29, 2024 · 892d95e · 892d95e
1 parent a5c648b
commit 892d95e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,8 +1,17 @@
-2024-10-29 Xanthos Xanthopoulos <[email protected]>
+2024-10-29  Dirk Eddelbuettel  <[email protected]>
 
-	* inst/include/rcpp_sink.h: Use spdlog::memory_buf_t as string when building under C++20 with SPDLOG_USE_STD_FORMAT
-	* inst/include/RcppSpdlog_types.h: Abort compilation if SPDLOG_USE_STD_FORMAT without C++20 or greater
-	* inst/include/spdl.h: Use std::vformat if SPDLOG_USE_STD_FORMAT flag is set
+	* DESCRIPTION (Version, Date): Roll micro release version
+
+	* inst/include/rcpp_sink.h: Move C++20 or greater check here, micro edit
+
+2024-10-29  Xanthos Xanthopoulos  <[email protected]>
+
+	* inst/include/rcpp_sink.h: Use spdlog::memory_buf_t as string when
+	building under C++20 with SPDLOG_USE_STD_FORMAT
+	* inst/include/RcppSpdlog_types.h: Abort compilation if
+	SPDLOG_USE_STD_FORMAT without C++20 or greater
+	* inst/include/spdl.h: Use std::vformat if SPDLOG_USE_STD_FORMAT flag
+	is set
 	* src/formatter.cpp: Idem
 
 2024-10-13  Dirk Eddelbuettel  <[email protected]>

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: RcppSpdlog
 Type: Package
 Title: R and C++ Interfaces to 'spdlog' C++ Header Library for Logging
-Version: 0.0.18.1
-Date: 2024-10-13
+Version: 0.0.18.2
+Date: 2024-10-29
 License: GPL (>= 2)
 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "[email protected]",
                     comment = c(ORCID = "0000-0001-6419-907X")),

diff --git a/inst/include/RcppSpdlog_types.h b/inst/include/RcppSpdlog_types.h
@@ -1,10 +1,6 @@
 
 #pragma once
 
-#if defined(SPDLOG_USE_STD_FORMAT) && __cplusplus < 202002L
-#error SPDLOG_USE_STD_FORMAT should only be set when compiling with C++20 and greater
-#endif
-
 #include <Rcpp/Lightest>
 #if defined(RCPPSPDLOG_STOPWATCH_NO_FMT)
   #include <spdlog_stopwatch.h>	    	// spdlog::stopwatch without fmt header

diff --git a/inst/include/rcpp_sink.h b/inst/include/rcpp_sink.h
@@ -5,6 +5,10 @@
 // this define is important to no include another logger pulling in stdout
 #define SPDLOG_DISABLE_DEFAULT_LOGGER 1
 
+#if defined(SPDLOG_USE_STD_FORMAT) && __cplusplus < 202002L
+#error SPDLOG_USE_STD_FORMAT should only be set when compiling with C++20 or greater
+#endif
+
 #include "spdlog/spdlog.h"
 #include "spdlog/sinks/base_sink.h"
 #include "spdlog/sinks/basic_file_sink.h"