Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-01 22:28:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

src/3rdparty: Move jthread/stop_token out of std namespace to prevent collisions

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-06-04 15:16:53 -07:00
parent 3046be57da
commit 21fc299131
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/3rdparty/jthread.hpp vendored
View file

@ -15,7 +15,7 @@
#include "stop_token.hpp" #include "stop_token.hpp"
namespace std { namespace nonstd {
//***************************************** //*****************************************
//* class jthread //* class jthread
@ -148,6 +148,6 @@ inline void jthread::swap(jthread& t) noexcept {
} }
} // namespace std } // namespace nonstd
#endif // JTHREAD_HPP #endif // JTHREAD_HPP

4
src/3rdparty/stop_token.hpp vendored
View file

@ -16,7 +16,7 @@
#include <immintrin.h> #include <immintrin.h>
#endif #endif
namespace std { namespace nonstd {
inline void __spin_yield() noexcept { inline void __spin_yield() noexcept {
// TODO: Platform-specific code here // TODO: Platform-specific code here
#if defined(__x86_64__) || defined(_M_X64) #if defined(__x86_64__) || defined(_M_X64)
@ -507,4 +507,4 @@ private:
template<typename _Callback> template<typename _Callback>
stop_callback(stop_token, _Callback) -> stop_callback<_Callback>; stop_callback(stop_token, _Callback) -> stop_callback<_Callback>;
} // namespace std } // namespace nonstd