You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/02/25 01:25:12 UTC
mesos git commit: Windows: Marked functions in headers `inline` to
avoid linker errors.
Repository: mesos
Updated Branches:
refs/heads/master 78fb49ba9 -> 0deb7447f
Windows: Marked functions in headers `inline` to avoid linker errors.
Review: https://reviews.apache.org/r/43417/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0deb7447
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0deb7447
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0deb7447
Branch: refs/heads/master
Commit: 0deb7447f6c30803f962119368925a406c294626
Parents: 78fb49b
Author: Alex Clemmer <cl...@gmail.com>
Authored: Wed Feb 24 16:22:48 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Wed Feb 24 16:23:11 2016 -0800
----------------------------------------------------------------------
.../3rdparty/stout/include/stout/internal/windows/dirent.hpp | 5 ++++-
.../3rdparty/stout/include/stout/os/windows/rmdir.hpp | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0deb7447/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/dirent.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/dirent.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/dirent.hpp
index 0463881..c1113e5 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/dirent.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/dirent.hpp
@@ -152,7 +152,10 @@ inline struct dirent* readdir(DIR* directory)
// to point at `NULL`.
//
// [1] https://www.gnu.org/software/libc/manual/html_node/Reading_002fClosing-Directory.html
-int readdir_r(DIR* directory, struct dirent* entry, struct dirent** result)
+inline int readdir_r(
+ DIR* directory,
+ struct dirent* entry,
+ struct dirent** result)
{
if (directory == NULL) {
errno = EBADF;
http://git-wip-us.apache.org/repos/asf/mesos/blob/0deb7447/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/rmdir.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/rmdir.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/rmdir.hpp
index 9a592c4..4e3dd0f 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/rmdir.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/rmdir.hpp
@@ -29,7 +29,7 @@ namespace internal {
// Recursive version of `RemoveDirectory`. NOTE: unlike `rmdir`, this requires
// Windows-formatted paths, and therefore should be in the `internal` namespace.
-Try<Nothing> recursive_remove_directory(const std::string& path)
+inline Try<Nothing> recursive_remove_directory(const std::string& path)
{
// Appending a slash here if the path doesn't already have one simplifies
// path join logic later, because (unlike Unix) Windows doesn't like double