fix a possible ODR issue

haohaolee · haohaolee · commit 49171c748475 · 2025-12-26T06:43:25.000+08:00
diff --git a/rest/controller/MeterReadingController.h b/rest/controller/MeterReadingController.h
@@ -16,18 +16,18 @@
 namespace http = boost::beast::http;
 
 namespace detail {
-auto toRfc3339(std::chrono::time_point<std::chrono::system_clock> time) {
+inline auto toRfc3339(std::chrono::time_point<std::chrono::system_clock> time) {
   return date::format("%FT%TZ", time);
 }
 
-auto fromRfc3339(const std::string &time) {
+inline auto fromRfc3339(const std::string &time) {
   std::chrono::time_point<std::chrono::system_clock> tp;
   std::istringstream ss(time);
   ss >> date::parse("%FT%TZ", tp);
   return tp;
 }
 
-auto renderReadingAsJson(const ElectricityReading &r) {
+inline auto renderReadingAsJson(const ElectricityReading &r) {
   return nlohmann::json{{"time", toRfc3339(r.getTime())}, {"reading", double(r.getReading()) / 10000}};
 }
 }  // namespace detail

Original file line number	Diff line number	Diff line change
`@@ -16,18 +16,18 @@`
`16`	`16`	`namespace http = boost::beast::http;`
`17`	`17`
`18`	`18`	`namespace detail {`
`19`		`-auto toRfc3339(std::chrono::time_point<std::chrono::system_clock> time) {`
	`19`	`+inline auto toRfc3339(std::chrono::time_point<std::chrono::system_clock> time) {`
`20`	`20`	`return date::format("%FT%TZ", time);`
`21`	`21`	`}`
`22`	`22`
`23`		`-auto fromRfc3339(const std::string &time) {`
	`23`	`+inline auto fromRfc3339(const std::string &time) {`
`24`	`24`	`std::chrono::time_point<std::chrono::system_clock> tp;`
`25`	`25`	`std::istringstream ss(time);`
`26`	`26`	`ss >> date::parse("%FT%TZ", tp);`
`27`	`27`	`return tp;`
`28`	`28`	`}`
`29`	`29`
`30`		`-auto renderReadingAsJson(const ElectricityReading &r) {`
	`30`	`+inline auto renderReadingAsJson(const ElectricityReading &r) {`
`31`	`31`	`return nlohmann::json{{"time", toRfc3339(r.getTime())}, {"reading", double(r.getReading()) / 10000}};`
`32`	`32`	`}`
`33`	`33`	`} // namespace detail`