mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
src/3rdparty: Move jthread/stop_token out of std namespace to prevent collisions
This commit is contained in:
parent
3046be57da
commit
21fc299131
2 changed files with 4 additions and 4 deletions
4
src/3rdparty/jthread.hpp
vendored
4
src/3rdparty/jthread.hpp
vendored
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "stop_token.hpp"
|
||||
|
||||
namespace std {
|
||||
namespace nonstd {
|
||||
|
||||
//*****************************************
|
||||
//* class jthread
|
||||
|
@ -148,6 +148,6 @@ inline void jthread::swap(jthread& t) noexcept {
|
|||
}
|
||||
|
||||
|
||||
} // namespace std
|
||||
} // namespace nonstd
|
||||
|
||||
#endif // JTHREAD_HPP
|
||||
|
|
4
src/3rdparty/stop_token.hpp
vendored
4
src/3rdparty/stop_token.hpp
vendored
|
@ -16,7 +16,7 @@
|
|||
#include <immintrin.h>
|
||||
#endif
|
||||
|
||||
namespace std {
|
||||
namespace nonstd {
|
||||
inline void __spin_yield() noexcept {
|
||||
// TODO: Platform-specific code here
|
||||
#if defined(__x86_64__) || defined(_M_X64)
|
||||
|
@ -507,4 +507,4 @@ private:
|
|||
template<typename _Callback>
|
||||
stop_callback(stop_token, _Callback) -> stop_callback<_Callback>;
|
||||
|
||||
} // namespace std
|
||||
} // namespace nonstd
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue