Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tidy] Fix syscall deprecation on macOS #3354

Merged
merged 2 commits into from
May 31, 2017

Conversation

obelisk
Copy link
Contributor

@obelisk obelisk commented May 29, 2017

The syscall to get thread id is deprecated on macOS as of 10.12. This replaces the syscall with a std:: library call. I found this code mod in another project here and discussion of it here.

The syscall to get thread id is deprecated on macOS as of 10.12. This replaces the syscall with a std:: library call. I found this code mod in a another project here gabime/spdlog@b715378#diff-075620b19501eee6536187116b2c8ff9R183 and discussion of it here gabime/spdlog#74.
@facebook-github-bot facebook-github-bot added the cla signed Automated label: Pull Request author has signed the osquery CLA label May 29, 2017
#if !defined(FREEBSD)
#if defined(__APPLE__)
return std::hash<std::thread::id>()(std::this_thread::get_id());
#elif !defined(FREEBSD)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would std::this_thread::get_id work on FreeBSD too?

@facebook-github-bot
Copy link

@jedi22 updated the pull request - view changes

@obelisk
Copy link
Contributor Author

obelisk commented May 30, 2017

test freebsd please

@osqueryer
Copy link

👎 The commit def5378 (Job results: 78) failed one or more tests (FreeBSD).

@lxcode
Copy link
Contributor

lxcode commented May 30, 2017

Fbsd build will break until this gets resolved:

facebook/rocksdb#2386

@osqueryer
Copy link

👎 The commit def5378 (Job results: 79) failed one or more tests (FreeBSD).

@theopolis theopolis merged commit f9cb714 into osquery:master May 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla signed Automated label: Pull Request author has signed the osquery CLA debt macOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants