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

Fix namespace resolution issue in LOG_EVERY_T #801

Merged
merged 1 commit into from
Mar 16, 2022

Conversation

skeptic-monkey
Copy link
Contributor

int64 is a typedef defined within @ac_google_namespace@, while LOG_EVERY_T is defined within ::google:: namespace.
but @ac_google_namespace@ is configurable and might not always be "google".

It can result in a compilation error, int64 being undefined. using absolute namespace resolution with @ac_google_namespace@:: fixes it.

Also replaced 2 other hardcoded google:: usage.

@codecov-commenter
Copy link

codecov-commenter commented Feb 25, 2022

Codecov Report

Merging #801 (c640c2f) into master (5addeed) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #801   +/-   ##
=======================================
  Coverage   73.20%   73.20%           
=======================================
  Files          17       17           
  Lines        3281     3281           
=======================================
  Hits         2402     2402           
  Misses        879      879           
Impacted Files Coverage Δ
src/glog/logging.h.in 80.00% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5addeed...c640c2f. Read the comment docs.

@skeptic-monkey skeptic-monkey changed the title Fix namesapace resolution issue in LOG_EVERY_T Fix namespace resolution issue in LOG_EVERY_T Feb 25, 2022
@skeptic-monkey
Copy link
Contributor Author

I stuggle to see the link between my change and the failing tests on MacOS.

@sergiud
Copy link
Collaborator

sergiud commented Feb 27, 2022

Thanks for the PR. The macOS runner seems to be volatile or our tests flaky.

Can you provide a reproducer for the failures you are describing? I'm just wondering why our CI did not catch these problems.

@skeptic-monkey
Copy link
Contributor Author

I honestly don't understand either, I checked and this part of the code seem covered by the tests.

I'll try to create a sample project that reproduce it. Meanwhile I can at least describe our setup.
We are integrating glog in our bazel based project, and we build on windows 11 using clang-cl.

@sergiud
Copy link
Collaborator

sergiud commented Mar 1, 2022

Thanks for the details.

@drigz It seems we need a Bazel runner that uses clang-cl in addition to MSVC. Is there a chance you can look into it?

drigz added a commit that referenced this pull request Mar 2, 2022
This should catch issues like #801. This uses the new `tasks` syntax to
define multiple Windows tasks:

https://github.com/bazelbuild/continuous-integration/blob/master/buildkite/README.md#basic-syntax
drigz added a commit that referenced this pull request Mar 2, 2022
This should catch issues like #801. This uses the new `tasks` syntax to
define multiple Windows tasks:

https://github.com/bazelbuild/continuous-integration/blob/master/buildkite/README.md#basic-syntax
drigz added a commit that referenced this pull request Mar 2, 2022
This should catch issues like #801. This uses the new `tasks` syntax to
define multiple Windows tasks:

https://github.com/bazelbuild/continuous-integration/blob/master/buildkite/README.md#basic-syntax
drigz added a commit that referenced this pull request Mar 4, 2022
This should catch issues like #801. This uses the new `tasks` syntax to
define multiple Windows tasks:

https://github.com/bazelbuild/continuous-integration/blob/master/buildkite/README.md#basic-syntax
@sergiud
Copy link
Collaborator

sergiud commented Mar 14, 2022

@skeptic-monkey Could you please rebase?

@skeptic-monkey
Copy link
Contributor Author

@skeptic-monkey Could you please rebase?

Done.

@sergiud sergiud added this to the 0.6 milestone Mar 16, 2022
@sergiud
Copy link
Collaborator

sergiud commented Mar 16, 2022

Thanks!

@sergiud sergiud merged commit 864ef64 into google:master Mar 16, 2022
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.

3 participants