Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
spdlog
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
spdlog
Commits
431fb423
Commit
431fb423
authored
Jun 24, 2017
by
Gabi Melman
Committed by
GitHub
Jun 24, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #463 from sheldonlyr/threadid-osx
More meaningful thread id for OSX
parents
1e4f14c7
66a2c499
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
include/spdlog/details/os.h
include/spdlog/details/os.h
+5
-1
No files found.
include/spdlog/details/os.h
View file @
431fb423
...
@@ -330,7 +330,11 @@ inline size_t _thread_id()
...
@@ -330,7 +330,11 @@ inline size_t _thread_id()
long
tid
;
long
tid
;
thr_self
(
&
tid
);
thr_self
(
&
tid
);
return
static_cast
<
size_t
>
(
tid
);
return
static_cast
<
size_t
>
(
tid
);
#else //Default to standard C++11 (OSX and other Unix)
#elif __APPLE__
uint64_t
tid
;
pthread_threadid_np
(
nullptr
,
&
tid
);
return
static_cast
<
size_t
>
(
tid
);
#else //Default to standard C++11 (other Unix)
return
static_cast
<
size_t
>
(
std
::
hash
<
std
::
thread
::
id
>
()(
std
::
this_thread
::
get_id
()));
return
static_cast
<
size_t
>
(
std
::
hash
<
std
::
thread
::
id
>
()(
std
::
this_thread
::
get_id
()));
#endif
#endif
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment