Fix logging-init on non-MSVC.

Adnn · Adnn · commit ae7693ae4493 · 2025-04-24T19:26:36.000+02:00
diff --git a/src/apps/ch10_area_lights/ch10_area_lights/log/Logging-init.cpp b/src/apps/ch10_area_lights/ch10_area_lights/log/Logging-init.cpp
@@ -41,10 +41,10 @@ void ad_rtr_ch10_loggerinitialization()
 namespace ad::renderer {
 
 
-std::pair<std::shared_ptr<spdlog::logger>, std::shared_ptr<spdlog::logger>>
+std::tuple<std::shared_ptr<spdlog::logger>>
 initializeLogger()
 {
-    return std::make_pair(spdlog::stdout_color_mt(gMainLogger));
+    return std::make_tuple(spdlog::stdout_color_mt(gMainLogger));
 }
 
 
diff --git a/src/apps/ch10_area_lights/ch10_area_lights/log/Logging-init.h b/src/apps/ch10_area_lights/ch10_area_lights/log/Logging-init.h
@@ -40,14 +40,13 @@ void ad_rtr_ch10_loggerinitialization();
 namespace ad {
 
 
-std::pair<std::shared_ptr<spdlog::logger>, std::shared_ptr<spdlog::logger>>
+std::tuple<std::shared_ptr<spdlog::logger>>
 initializeLogger();
 
 struct LoggerInitialization
 {
-    inline static const std::pair<std::shared_ptr<spdlog::logger>,
-                                std::shared_ptr<spdlog::logger>>
-        logger = initializeLogger();
+    inline static const std::tuple<std::shared_ptr<spdlog::logger>>
+        gLogger = initializeLogger();
 };
 
 
diff --git a/src/apps/ch10_ltc/ch10_ltc/log/Logging-init.cpp b/src/apps/ch10_ltc/ch10_ltc/log/Logging-init.cpp
@@ -41,10 +41,10 @@ void ad_rtr_ch10_loggerinitialization()
 namespace ad::renderer {
 
 
-std::pair<std::shared_ptr<spdlog::logger>, std::shared_ptr<spdlog::logger>>
+std::tuple<std::shared_ptr<spdlog::logger>>
 initializeLogger()
 {
-    return std::make_pair(spdlog::stdout_color_mt(gMainLogger));
+    return std::make_tuple(spdlog::stdout_color_mt(gMainLogger));
 }
 
 
diff --git a/src/apps/ch10_ltc/ch10_ltc/log/Logging-init.h b/src/apps/ch10_ltc/ch10_ltc/log/Logging-init.h
@@ -40,14 +40,13 @@ void ad_rtr_ch10_loggerinitialization();
 namespace ad {
 
 
-std::pair<std::shared_ptr<spdlog::logger>, std::shared_ptr<spdlog::logger>>
+std::tuple<std::shared_ptr<spdlog::logger>>
 initializeLogger();
 
 struct LoggerInitialization
 {
-    inline static const std::pair<std::shared_ptr<spdlog::logger>,
-                                std::shared_ptr<spdlog::logger>>
-        logger = initializeLogger();
+    inline static const std::tuple<std::shared_ptr<spdlog::logger>>
+        gLogger = initializeLogger();
 };
 
 
diff --git a/src/apps/ch11_ssao/ch11_ssao/log/Logging-init.cpp b/src/apps/ch11_ssao/ch11_ssao/log/Logging-init.cpp
@@ -42,10 +42,10 @@ void ad_rtr_ch10_loggerinitialization()
 namespace ad::renderer {
 
 
-std::pair<std::shared_ptr<spdlog::logger>, std::shared_ptr<spdlog::logger>>
+std::tuple<std::shared_ptr<spdlog::logger>>
 initializeLogger()
 {
-    return std::make_pair(spdlog::stdout_color_mt(gMainLogger));
+    return std::make_tuple(spdlog::stdout_color_mt(gMainLogger));
 }
 
 
diff --git a/src/apps/ch11_ssao/ch11_ssao/log/Logging-init.h b/src/apps/ch11_ssao/ch11_ssao/log/Logging-init.h
@@ -40,14 +40,13 @@ void ad_rtr_ch10_loggerinitialization();
 namespace ad {
 
 
-std::pair<std::shared_ptr<spdlog::logger>, std::shared_ptr<spdlog::logger>>
+std::tuple<std::shared_ptr<spdlog::logger>>
 initializeLogger();
 
 struct LoggerInitialization
 {
-    inline static const std::pair<std::shared_ptr<spdlog::logger>,
-                                std::shared_ptr<spdlog::logger>>
-        logger = initializeLogger();
+    inline static const std::tuple<std::shared_ptr<spdlog::logger>>
+        gLogger = initializeLogger();
 };
 
 
diff --git a/src/libs/engine/engine/log/Logging-init.cpp b/src/libs/engine/engine/log/Logging-init.cpp
@@ -41,10 +41,10 @@ void ad_renderer_loggerinitialization()
 namespace ad::renderer {
 
 
-std::pair<std::shared_ptr<spdlog::logger>, std::shared_ptr<spdlog::logger>>
+std::tuple<std::shared_ptr<spdlog::logger>>
 initializeLogger()
 {
-    return std::make_pair(spdlog::stdout_color_mt(gMainLogger));
+    return std::make_tuple(spdlog::stdout_color_mt(gMainLogger));
 }
 
 
diff --git a/src/libs/engine/engine/log/Logging-init.h b/src/libs/engine/engine/log/Logging-init.h
@@ -40,14 +40,14 @@ void ad_renderer_loggerinitialization();
 namespace ad::renderer {
 
 
-std::pair<std::shared_ptr<spdlog::logger>, std::shared_ptr<spdlog::logger>>
+std::tuple<std::shared_ptr<spdlog::logger>>
 initializeLogger();
 
 struct LoggerInitialization
 {
-    inline static const std::pair<std::shared_ptr<spdlog::logger>,
-                                std::shared_ptr<spdlog::logger>>
-        logger = initializeLogger();
+
+    inline static const std::tuple<std::shared_ptr<spdlog::logger>>
+        gLogger = initializeLogger();
 };
 
 
diff --git a/src/libs/scenic/scenic/log/Logging-init.cpp b/src/libs/scenic/scenic/log/Logging-init.cpp
@@ -41,10 +41,10 @@ void ad_renderer_loggerinitialization()
 namespace ad::renderer {
 
 
-std::pair<std::shared_ptr<spdlog::logger>, std::shared_ptr<spdlog::logger>>
+std::tuple<std::shared_ptr<spdlog::logger>>
 initializeLogger()
 {
-    return std::make_pair(spdlog::stdout_color_mt(gMainLogger));
+    return std::make_tuple(spdlog::stdout_color_mt(gMainLogger));
 }
 
 
diff --git a/src/libs/scenic/scenic/log/Logging-init.h b/src/libs/scenic/scenic/log/Logging-init.h
@@ -40,14 +40,13 @@ void ad_renderer_loggerinitialization();
 namespace ad::renderer {
 
 
-std::pair<std::shared_ptr<spdlog::logger>, std::shared_ptr<spdlog::logger>>
+std::tuple<std::shared_ptr<spdlog::logger>>
 initializeLogger();
 
 struct LoggerInitialization
 {
-    inline static const std::pair<std::shared_ptr<spdlog::logger>,
-                                std::shared_ptr<spdlog::logger>>
-        logger = initializeLogger();
+    inline static const std::tuple<std::shared_ptr<spdlog::logger>>
+        gLogger = initializeLogger();
 };
 
 

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,10 @@ void ad_rtr_ch10_loggerinitialization()`
`41`	`41`	`namespace ad::renderer {`
`42`	`42`
`43`	`43`
`44`		`-std::pair<std::shared_ptr<spdlog::logger>, std::shared_ptr<spdlog::logger>>`
	`44`	`+std::tuple<std::shared_ptr<spdlog::logger>>`
`45`	`45`	`initializeLogger()`
`46`	`46`	`{`
`47`		`- return std::make_pair(spdlog::stdout_color_mt(gMainLogger));`
	`47`	`+ return std::make_tuple(spdlog::stdout_color_mt(gMainLogger));`
`48`	`48`	`}`
`49`	`49`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,10 @@ void ad_rtr_ch10_loggerinitialization()`
`42`	`42`	`namespace ad::renderer {`
`43`	`43`
`44`	`44`
`45`		`-std::pair<std::shared_ptr<spdlog::logger>, std::shared_ptr<spdlog::logger>>`
	`45`	`+std::tuple<std::shared_ptr<spdlog::logger>>`
`46`	`46`	`initializeLogger()`
`47`	`47`	`{`
`48`		`- return std::make_pair(spdlog::stdout_color_mt(gMainLogger));`
	`48`	`+ return std::make_tuple(spdlog::stdout_color_mt(gMainLogger));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,10 @@ void ad_renderer_loggerinitialization()`
`41`	`41`	`namespace ad::renderer {`
`42`	`42`
`43`	`43`
`44`		`-std::pair<std::shared_ptr<spdlog::logger>, std::shared_ptr<spdlog::logger>>`
	`44`	`+std::tuple<std::shared_ptr<spdlog::logger>>`
`45`	`45`	`initializeLogger()`
`46`	`46`	`{`
`47`		`- return std::make_pair(spdlog::stdout_color_mt(gMainLogger));`
	`47`	`+ return std::make_tuple(spdlog::stdout_color_mt(gMainLogger));`
`48`	`48`	`}`
`49`	`49`
`50`	`50`