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

Misc. Windows fixes #104

Merged
merged 1 commit into from
Sep 27, 2018
Merged

Misc. Windows fixes #104

merged 1 commit into from
Sep 27, 2018

Conversation

sesmith177
Copy link
Contributor

This commit contains some miscellaneous Windows fixes discovered while
integrating PGV with Envoy

  • Remove incorrect comment about including validate/validate.proto
  • Always make sure WIN32 is defined when compiling *.pb.validate.cc
  • Include <google/protobuf/message.h> and <google/protobuf/util/time_util.h>
    in the *.pb.validate.cc file instead of validate\validate.h. This is because
    these headers include <windows.h> which defines many macros (e.g.
    DELETE). If this header is then included before any code that has
    symbols by the same name, it will fail to compile
  • Use std::unordered_map instead of std::map because we don't care about
    traversing the keys in order
  • Remove the complicated windows.ps1 set up script and just run the
    bazel command

Signed-off-by: Amin Jamali ajamali@pivotal.io

This commit contains some miscellaneous Windows fixes discoverd while
integrating PGV with Envoy

- Remove incorrect comment about including "validate/validate.proto"
- Always make sure WIN32 is defined when compiling *.pb.validate.cc
- Include <google/protobuf/message.h> and <google/protobuf/util/time_util.h>
  in the *.pb.validate.cc file instead of validate.h. This is because
  these headers include <windows.h> which defines many macros (e.g.
  DELETE). If this header is then included before any code that has
  symbols by the same name, it will fail to compile
- Use std::unordered_map instead of std::map because we don't care about
  traversing the keys in order
- Remove the complicated windows.ps1 set up script and just run the
  bazel command

Signed-off-by: Amin Jamali <ajamali@pivotal.io>
Copy link
Member

@rodaine rodaine left a comment

Choose a reason for hiding this comment

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

LGTM

@rodaine rodaine merged commit 30da78c into bufbuild:master Sep 27, 2018
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.

2 participants