From d047ada4de60410d4829401281bca75a83ddc41f Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Wed, 5 Jun 2019 20:14:11 +0300
Subject: [PATCH] Second attempt at fix
---
components/common/cpp/include/loguru.hpp | 2 +-
components/net/cpp/src/universe.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/common/cpp/include/loguru.hpp b/components/common/cpp/include/loguru.hpp
index 84b3ca68a..e43dc742e 100644
--- a/components/common/cpp/include/loguru.hpp
+++ b/components/common/cpp/include/loguru.hpp
@@ -536,7 +536,7 @@ namespace loguru
class LOGURU_EXPORT LogScopeRAII
{
public:
- LogScopeRAII() : _file(nullptr), _line(0), _indent_stderr(false), _start_time_ns(0), _name({0}) {} // No logging
+ LogScopeRAII() : _file(nullptr), _line(0), _indent_stderr(false), _start_time_ns(0), _name() {} // No logging
LogScopeRAII(Verbosity verbosity, const char* file, unsigned line, LOGURU_FORMAT_STRING_TYPE format, ...) LOGURU_PRINTF_LIKE(5, 6);
~LogScopeRAII();
diff --git a/components/net/cpp/src/universe.cpp b/components/net/cpp/src/universe.cpp
index 85733459c..28a6b0056 100644
--- a/components/net/cpp/src/universe.cpp
+++ b/components/net/cpp/src/universe.cpp
@@ -258,7 +258,8 @@ void Universe::_run() {
if (selres < 0) {
switch (errno) {
case 9 : continue; // Bad file descriptor = socket closed
- default : std::cout << "Unknown select error: " << strerror(errno) << std::endl;
+ case 4 : continue; // Interrupted system call ... no problem
+ default : LOG(WARNING) << "Unhandled select error: " << strerror(errno) << "(" << errno << ")";
}
continue;
} else if (selres == 0) {
--
GitLab