Repository: mesos Updated Branches: refs/heads/master 3bd7711b1 -> a1052300f
Replaced `<stout/windows/os.hpp>` with `<stout/os.hpp>` in stout. The intent is that `os.hpp` includes the correct OS-specific header, `windows/os.hpp` or `posix/os.hpp`, automatically. They should never be included manually. Review: https://reviews.apache.org/r/67933/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a1052300 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a1052300 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a1052300 Branch: refs/heads/master Commit: a1052300f3a85339c4eb98693b02c9afa45d6fc4 Parents: 3bd7711 Author: Andrew Schwartzmeyer <and...@schwartzmeyer.com> Authored: Wed Aug 1 14:22:16 2018 -0700 Committer: Andrew Schwartzmeyer <and...@schwartzmeyer.com> Committed: Wed Aug 1 14:22:16 2018 -0700 ---------------------------------------------------------------------- 3rdparty/stout/include/stout/os/windows/kill.hpp | 3 +-- 3rdparty/stout/include/stout/os/windows/rm.hpp | 2 -- 3rdparty/stout/include/stout/windows/net.hpp | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/a1052300/3rdparty/stout/include/stout/os/windows/kill.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/stout/include/stout/os/windows/kill.hpp b/3rdparty/stout/include/stout/os/windows/kill.hpp index bd94435..9e63ca3 100644 --- a/3rdparty/stout/include/stout/os/windows/kill.hpp +++ b/3rdparty/stout/include/stout/os/windows/kill.hpp @@ -15,9 +15,8 @@ #include <glog/logging.h> +#include <stout/os.hpp> #include <stout/windows.hpp> -#include <stout/windows/os.hpp> - namespace os { http://git-wip-us.apache.org/repos/asf/mesos/blob/a1052300/3rdparty/stout/include/stout/os/windows/rm.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/stout/include/stout/os/windows/rm.hpp b/3rdparty/stout/include/stout/os/windows/rm.hpp index 1c66e3e..2cacb28 100644 --- a/3rdparty/stout/include/stout/os/windows/rm.hpp +++ b/3rdparty/stout/include/stout/os/windows/rm.hpp @@ -22,11 +22,9 @@ #include <stout/windows.hpp> #include <stout/os/stat.hpp> -#include <stout/windows/os.hpp> #include <stout/internal/windows/longpath.hpp> - namespace internal { namespace windows { http://git-wip-us.apache.org/repos/asf/mesos/blob/a1052300/3rdparty/stout/include/stout/windows/net.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/stout/include/stout/windows/net.hpp b/3rdparty/stout/include/stout/windows/net.hpp index d70f967..7439863 100644 --- a/3rdparty/stout/include/stout/windows/net.hpp +++ b/3rdparty/stout/include/stout/windows/net.hpp @@ -20,13 +20,11 @@ #include <stout/error.hpp> #include <stout/foreach.hpp> #include <stout/nothing.hpp> +#include <stout/os.hpp> #include <stout/stringify.hpp> #include <stout/try.hpp> #include <stout/windows.hpp> // For `iphlpapi.h`. -#include <stout/windows/os.hpp> - - namespace net { inline struct addrinfoW createAddrInfo(int socktype, int family, int flags)
