You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@mesos.apache.org by Joseph Wu <jo...@mesosphere.io> on 2017/02/23 01:24:01 UTC

Review Request 56962: Windows: Undefined `ACL` macro defined in Zookeeper headers.

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/56962/
-----------------------------------------------------------

Review request for mesos, Andrew Schwartzmeyer and Gast�n Kleiman.


Repository: mesos


Description
-------

On Windows, Zookeeper will define a `ACL` macro because `Windows.h`
defines a `struct ACL`, different from Zookeeper's `struct ACL`.
Since this is a macro, it bleeds into other sources and ends up
replacing odd bits of code, such as when we access our namespaced
`ACL`s.  i.e. `mesos::ACL::RunTask`.

This commit undefines the `ACL` macro after the inclusion of the
Zookeeper headers in two places, while redefining the macro in the
one source file where we use Zookeeper's `struct ACL`.


Diffs
-----

  include/mesos/zookeeper/authentication.hpp 6a955abfe02c5e1f8993cb5cb444a2fd257401b9 
  include/mesos/zookeeper/zookeeper.hpp d4723dde90ffcca3208d70fb1e8cae87a0d0d1a8 
  src/tests/api_tests.cpp 378612dd4d038fb4d65fba60a4be00d4950d0c02 
  src/zookeeper/authentication.cpp 0fd99b019a5b4f65d2094eee637351f7ff2206a9 

Diff: https://reviews.apache.org/r/56962/diff/


Testing
-------

msbuild Mesos.sln

src/mesos-tests.exe


Thanks,

Joseph Wu


Re: Review Request 56962: Windows: Undefined `ACL` macro defined in Zookeeper headers.

Posted by Gastón Kleiman <ga...@mesosphere.io>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/56962/#review166567
-----------------------------------------------------------


Ship it!




Not a Windows expert, but the change looks sane!

- Gast�n Kleiman


On Feb. 23, 2017, 1:24 a.m., Joseph Wu wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/56962/
> -----------------------------------------------------------
> 
> (Updated Feb. 23, 2017, 1:24 a.m.)
> 
> 
> Review request for mesos, Andrew Schwartzmeyer and Gast�n Kleiman.
> 
> 
> Repository: mesos
> 
> 
> Description
> -------
> 
> On Windows, Zookeeper will define a `ACL` macro because `Windows.h`
> defines a `struct ACL`, different from Zookeeper's `struct ACL`.
> Since this is a macro, it bleeds into other sources and ends up
> replacing odd bits of code, such as when we access our namespaced
> `ACL`s.  i.e. `mesos::ACL::RunTask`.
> 
> This commit undefines the `ACL` macro after the inclusion of the
> Zookeeper headers in two places, while redefining the macro in the
> one source file where we use Zookeeper's `struct ACL`.
> 
> 
> Diffs
> -----
> 
>   include/mesos/zookeeper/authentication.hpp 6a955abfe02c5e1f8993cb5cb444a2fd257401b9 
>   include/mesos/zookeeper/zookeeper.hpp d4723dde90ffcca3208d70fb1e8cae87a0d0d1a8 
>   src/tests/api_tests.cpp 378612dd4d038fb4d65fba60a4be00d4950d0c02 
>   src/zookeeper/authentication.cpp 0fd99b019a5b4f65d2094eee637351f7ff2206a9 
> 
> Diff: https://reviews.apache.org/r/56962/diff/
> 
> 
> Testing
> -------
> 
> msbuild Mesos.sln
> 
> src/mesos-tests.exe
> 
> 
> Thanks,
> 
> Joseph Wu
> 
>


Re: Review Request 56962: Windows: Undefined `ACL` macro defined in Zookeeper headers.

Posted by Mesos Reviewbot <re...@mesos.apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/56962/#review166479
-----------------------------------------------------------



Patch looks great!

Reviews applied: [56962]

Passed command: export OS='ubuntu:14.04' BUILDTOOL='autotools' COMPILER='gcc' CONFIGURATION='--verbose' ENVIRONMENT='GLOG_v=1 MESOS_VERBOSE=1'; ./support/docker-build.sh

- Mesos Reviewbot


On Feb. 23, 2017, 1:24 a.m., Joseph Wu wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/56962/
> -----------------------------------------------------------
> 
> (Updated Feb. 23, 2017, 1:24 a.m.)
> 
> 
> Review request for mesos, Andrew Schwartzmeyer and Gast�n Kleiman.
> 
> 
> Repository: mesos
> 
> 
> Description
> -------
> 
> On Windows, Zookeeper will define a `ACL` macro because `Windows.h`
> defines a `struct ACL`, different from Zookeeper's `struct ACL`.
> Since this is a macro, it bleeds into other sources and ends up
> replacing odd bits of code, such as when we access our namespaced
> `ACL`s.  i.e. `mesos::ACL::RunTask`.
> 
> This commit undefines the `ACL` macro after the inclusion of the
> Zookeeper headers in two places, while redefining the macro in the
> one source file where we use Zookeeper's `struct ACL`.
> 
> 
> Diffs
> -----
> 
>   include/mesos/zookeeper/authentication.hpp 6a955abfe02c5e1f8993cb5cb444a2fd257401b9 
>   include/mesos/zookeeper/zookeeper.hpp d4723dde90ffcca3208d70fb1e8cae87a0d0d1a8 
>   src/tests/api_tests.cpp 378612dd4d038fb4d65fba60a4be00d4950d0c02 
>   src/zookeeper/authentication.cpp 0fd99b019a5b4f65d2094eee637351f7ff2206a9 
> 
> Diff: https://reviews.apache.org/r/56962/diff/
> 
> 
> Testing
> -------
> 
> msbuild Mesos.sln
> 
> src/mesos-tests.exe
> 
> 
> Thanks,
> 
> Joseph Wu
> 
>


Re: Review Request 56962: Windows: Undefined `ACL` macro defined in Zookeeper headers.

Posted by Andrew Schwartzmeyer <an...@schwartzmeyer.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/56962/#review166547
-----------------------------------------------------------


Ship it!




Ship It!

- Andrew Schwartzmeyer


On Feb. 23, 2017, 1:24 a.m., Joseph Wu wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/56962/
> -----------------------------------------------------------
> 
> (Updated Feb. 23, 2017, 1:24 a.m.)
> 
> 
> Review request for mesos, Andrew Schwartzmeyer and Gast�n Kleiman.
> 
> 
> Repository: mesos
> 
> 
> Description
> -------
> 
> On Windows, Zookeeper will define a `ACL` macro because `Windows.h`
> defines a `struct ACL`, different from Zookeeper's `struct ACL`.
> Since this is a macro, it bleeds into other sources and ends up
> replacing odd bits of code, such as when we access our namespaced
> `ACL`s.  i.e. `mesos::ACL::RunTask`.
> 
> This commit undefines the `ACL` macro after the inclusion of the
> Zookeeper headers in two places, while redefining the macro in the
> one source file where we use Zookeeper's `struct ACL`.
> 
> 
> Diffs
> -----
> 
>   include/mesos/zookeeper/authentication.hpp 6a955abfe02c5e1f8993cb5cb444a2fd257401b9 
>   include/mesos/zookeeper/zookeeper.hpp d4723dde90ffcca3208d70fb1e8cae87a0d0d1a8 
>   src/tests/api_tests.cpp 378612dd4d038fb4d65fba60a4be00d4950d0c02 
>   src/zookeeper/authentication.cpp 0fd99b019a5b4f65d2094eee637351f7ff2206a9 
> 
> Diff: https://reviews.apache.org/r/56962/diff/
> 
> 
> Testing
> -------
> 
> msbuild Mesos.sln
> 
> src/mesos-tests.exe
> 
> 
> Thanks,
> 
> Joseph Wu
> 
>