Blocked declaration not well handled by older clang

Haivision · ethouris · Jul 19, 2024 · Jul 23, 2024 · Jul 26, 2024 · Aug 30, 2024
commit 596c436da2d95af9bbf3f0abfed6984fffabb5b9
diff --git a/srtcore/api.h b/srtcore/api.h
@@ -407,7 +407,11 @@ class CUDTUnited
     groups_t m_Groups;
 #endif
 
-    sync::Mutex m_GlobControlLock SRT_TSA_LOCK_ORDERS_AFTER(CUDT::m_ConnectionLock); // used to synchronize UDT API
+    // XXX Desired, but blocked because the older clang compilers
+    // do not handle this declaration correctly. Unblock in devel builds
+    // for checking.
+    // SRT_TSA_LOCK_ORDERS_AFTER(CUDT::m_ConnectionLock)
+    sync::Mutex m_GlobControlLock; // used to synchronize UDT API
 
     sync::Mutex m_IDLock; // used to synchronize ID generation
 

diff --git a/srtcore/api.cpp b/srtcore/api.cpp
    }
 }

 /* UNUSED. Restore if needed. NOTE: SRT_TSA_NEEDS_LOCKED(CUDTUnited::m_GlobControlLock)
 vector<SRTSOCKET> srt::CUDT::existingSockets()
 {
    vector<SRTSOCKET> out;
    for (CUDTUnited::sockets_t::iterator i = uglobal().m_Sockets.begin(); i != uglobal().m_Sockets.end(); ++i)
    {
        out.push_back(i->first);
    }
    return out;
 }
 */

 SRT_SOCKSTATUS srt::CUDT::getsockstate(SRTSOCKET u)
 {
	}
	}

	/* UNUSED. Restore if needed. NOTE: SRT_TSA_NEEDS_LOCKED(CUDTUnited::m_GlobControlLock)
	vector<SRTSOCKET> srt::CUDT::existingSockets()
	{
	vector<SRTSOCKET> out;
	for (CUDTUnited::sockets_t::iterator i = uglobal().m_Sockets.begin(); i != uglobal().m_Sockets.end(); ++i)
	{
	out.push_back(i->first);
	}
	return out;
	}
	*/
Check notice Code scanning / CodeQL Commented-out code Note This comment appears to contain commented-out code.

	SRT_SOCKSTATUS srt::CUDT::getsockstate(SRTSOCKET u)
	{