Repository: mesos Updated Branches: refs/heads/master cc8610be4 -> 6cf64ed9c
Removed `os/realpath.hpp` from `posix/os.hpp`. This is part of a clean-up chain to fix the problem where `stout/os.hpp` previously made `os::realpath()` available, but it was instead moved to its own header. Instead, files must include what is used, and so include the `realpath.hpp` header. Since `posix/os.hpp` doesn't use `os::realpath()`, its inclusion of `os/realpath.hpp` was removed, and instead code using the function was fixed to include the header directly. Note that this now matches `windows/os.hpp`, which also does not include `realpath.hpp`. The same pattern should be followed for other APIs as needed. Review: https://reviews.apache.org/r/64255 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0c867253 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0c867253 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0c867253 Branch: refs/heads/master Commit: 0c867253134d9b2b983188431facccc06ba3dac5 Parents: cc8610b Author: Andrew Schwartzmeyer <[email protected]> Authored: Fri Dec 1 10:07:33 2017 -0800 Committer: Andrew Schwartzmeyer <[email protected]> Committed: Fri Dec 1 11:49:27 2017 -0800 ---------------------------------------------------------------------- 3rdparty/stout/include/stout/posix/os.hpp | 1 - 3rdparty/stout/tests/os/filesystem_tests.cpp | 1 + 3rdparty/stout/tests/os_tests.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/0c867253/3rdparty/stout/include/stout/posix/os.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/stout/include/stout/posix/os.hpp b/3rdparty/stout/include/stout/posix/os.hpp index 8511dfd..d1bfa34 100644 --- a/3rdparty/stout/include/stout/posix/os.hpp +++ b/3rdparty/stout/include/stout/posix/os.hpp @@ -65,7 +65,6 @@ #include <stout/os/os.hpp> #include <stout/os/permissions.hpp> #include <stout/os/read.hpp> -#include <stout/os/realpath.hpp> #include <stout/os/rename.hpp> #include <stout/os/sendfile.hpp> #include <stout/os/signals.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/0c867253/3rdparty/stout/tests/os/filesystem_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/stout/tests/os/filesystem_tests.cpp b/3rdparty/stout/tests/os/filesystem_tests.cpp index 3946885..57e1dc1 100644 --- a/3rdparty/stout/tests/os/filesystem_tests.cpp +++ b/3rdparty/stout/tests/os/filesystem_tests.cpp @@ -29,6 +29,7 @@ #include <stout/os/ls.hpp> #include <stout/os/mkdir.hpp> #include <stout/os/read.hpp> +#include <stout/os/realpath.hpp> #include <stout/os/rename.hpp> #include <stout/os/rm.hpp> #include <stout/os/touch.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/0c867253/3rdparty/stout/tests/os_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/stout/tests/os_tests.cpp b/3rdparty/stout/tests/os_tests.cpp index 26514f3..93a23a8 100644 --- a/3rdparty/stout/tests/os_tests.cpp +++ b/3rdparty/stout/tests/os_tests.cpp @@ -48,7 +48,7 @@ #include <stout/os/int_fd.hpp> #include <stout/os/kill.hpp> #include <stout/os/killtree.hpp> -#include <stout/os/stat.hpp> +#include <stout/os/realpath.hpp> #include <stout/os/stat.hpp> #include <stout/os/write.hpp>
