Merge branch 'hotfix/1.26.4'

ecmwf · Jul 17, 2024 · 2aed19d · 2aed19d
2 parents eeacdc8 + 91c29c3
commit 2aed19d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.26.3
+1.26.4
diff --git a/src/eckit/log/CodeLocation.cc b/src/eckit/log/CodeLocation.cc
@@ -34,8 +34,8 @@ CodeLocation::operator bool() const {
 
 void CodeLocation::print(std::ostream& os) const {
     if (file_) {
-        os << " (" << file_ << " +" << line_;
-        if (func_ && ::strlen(func_)) {
+        os << " (" << file_ << ":" << line_;
+        if (func_ && ::strlen(func_) > 0) {
             os << " " << func_;
         }
         os << ")";

diff --git a/src/eckit/testing/Test.h b/src/eckit/testing/Test.h
@@ -453,20 +453,20 @@ int run_tests(int argc, char* argv[], bool initEckitMain = true) {
 #define EXPECT_MSG(expr, msg_callback)                                               \
     do {                                                                             \
         if (!(expr)) {                                                               \
-            auto msg = msg_callback;                                                 \
-            msg();                                                                   \
+            auto _msg = msg_callback;                                                \
+            _msg();                                                                  \
             throw eckit::testing::TestException("Condition failed: " #expr, Here()); \
         }                                                                            \
     } while (false)
 
 #define EXPECT_EQUAL(a, b)                                                                                         \
-    EXPECT_MSG(a == b, [=]() {                                                                                     \
+    EXPECT_MSG(a == b, [&]() {                                                                                     \
         std::cerr << eckit::Colour::red << "FAILED " << #a " == " << #b << " evaluated as [" << a << "] == [" << b \
                   << "]" << eckit::Colour::reset << std::endl;                                                     \
     };)
 
 #define EXPECT_NOT_EQUAL(a, b)                                                                                     \
-    EXPECT_MSG(a != b, [=]() {                                                                                     \
+    EXPECT_MSG(a != b, [&]() {                                                                                     \
         std::cerr << eckit::Colour::red << "FAILED " << #a " != " << #b << " evaluated as [" << a << "] != [" << b \
                   << "]" << eckit::Colour::reset << std::endl;                                                     \
     };)

diff --git a/src/eckit/thread/ThreadSingleton.h b/src/eckit/thread/ThreadSingleton.h
@@ -83,6 +83,7 @@ ThreadSingleton<T, A>::~ThreadSingleton() {
     T* value = (T*)::pthread_getspecific(key_);
     if (value) {
         ::pthread_key_delete(key_);
+        once_ = PTHREAD_ONCE_INIT;
         delete value;
     }
 }