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

Develop #150

Merged
merged 11 commits into from Feb 24, 2021
Merged

Develop #150

merged 11 commits into from Feb 24, 2021

Conversation

DigitalInBlue
Copy link
Owner

No description provided.

c72578 and others added 11 commits February 22, 2020 10:51
- _WIN32 is the recommended preprocessor macro
- Substitute occurrences of WIN32 with _WIN32 using:
  git grep -lw -e 'WIN32' -- | xargs sed -i -e 's/\<WIN32\>/_WIN32/g'
In file include/celero/ThreadLocal.h:
* `thread_local` is a C++ keyword so using an #ifdef check for its
  existence is not reliable. Instead, check for C++11 support to
  determine if `thread_local` is already defined. See here
  https://stackoverflow.com/questions/5047971/how-do-i-check-for-c11-support.
* Also the check `#if __STDC_VERSION__ >= 201112` is not meaningful,
  since presumably Celero is being compiled with a C++ compiler, so it
  has been removed.

In file src/Memory.cpp:
* Added include for `<cstring>` so that `strlen` and `strncmp` are
  defined for Apple environment.

Fixes #140
Also remove Google Test submodule.
@DigitalInBlue DigitalInBlue merged commit 4d96b25 into master Feb 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants