You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/04/20 23:32:02 UTC
[2/3] mesos git commit: Fixed typos in comments in libprocess.
Fixed typos in comments in libprocess.
Review: https://reviews.apache.org/r/46441/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6ce84cf2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6ce84cf2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6ce84cf2
Branch: refs/heads/master
Commit: 6ce84cf2492c7487d37a8f7f4dbf9c19602f7fc2
Parents: ffa644e
Author: Neil Conway <ne...@gmail.com>
Authored: Wed Apr 20 14:31:51 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Apr 20 14:31:51 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/Makefile.am | 2 +-
3rdparty/libprocess/include/process/defer.hpp | 4 ++--
3rdparty/libprocess/include/process/deferred.hpp | 4 ++--
3rdparty/libprocess/include/process/subprocess.hpp | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6ce84cf2/3rdparty/libprocess/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/Makefile.am b/3rdparty/libprocess/3rdparty/Makefile.am
index 9cb3098..f7aa579 100644
--- a/3rdparty/libprocess/3rdparty/Makefile.am
+++ b/3rdparty/libprocess/3rdparty/Makefile.am
@@ -134,7 +134,7 @@ if OS_FREEBSD
endif
if WITH_BUNDLED_GLOG
-# NOTE: We explicitely set GTEST_CONFIG=no so that we don't attempt to
+# NOTE: We explicitly set GTEST_CONFIG=no so that we don't attempt to
# build glog against a system installed gtest (there's no reason to
# "test" glog and it's highly likely it will cause a compilation bug
# when building with clang).
http://git-wip-us.apache.org/repos/asf/mesos/blob/6ce84cf2/3rdparty/libprocess/include/process/defer.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/defer.hpp b/3rdparty/libprocess/include/process/defer.hpp
index 6bb79cd..8fb4f3f 100644
--- a/3rdparty/libprocess/include/process/defer.hpp
+++ b/3rdparty/libprocess/include/process/defer.hpp
@@ -56,7 +56,7 @@ Deferred<void()> defer(const Process<T>* process, void (T::*method)())
// with variadic templates and lambdas, we still need to do
// preprocessor expansions. In addition, due to a bug with clang (or
// libc++) we can't use std::bind with a std::function so we have to
-// explicitely use the std::function<R(P...)>::operator() (see
+// explicitly use the std::function<R(P...)>::operator() (see
// http://stackoverflow.com/questions/20097616/stdbind-to-a-stdfunction-crashes-with-clang).
#define TEMPLATE(Z, N, DATA) \
template <typename T, \
@@ -165,7 +165,7 @@ Deferred<Future<R>()> defer(const Process<T>* process, Future<R> (T::*method)())
#undef TEMPLATE
-// Finaly, definitions of defer for methods returning a value:
+// Finally, definitions of defer for methods returning a value:
template <typename R, typename T>
Deferred<Future<R>()> defer(const PID<T>& pid, R (T::*method)())
http://git-wip-us.apache.org/repos/asf/mesos/blob/6ce84cf2/3rdparty/libprocess/include/process/deferred.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/deferred.hpp b/3rdparty/libprocess/include/process/deferred.hpp
index eb4739c..18ba979 100644
--- a/3rdparty/libprocess/include/process/deferred.hpp
+++ b/3rdparty/libprocess/include/process/deferred.hpp
@@ -51,7 +51,7 @@ private:
};
-// We need an intermeidate "deferred" type because when constructing a
+// We need an intermediate "deferred" type because when constructing a
// Deferred we won't always know the underlying function type (for
// example, if we're being passed a std::bind or a lambda). A lambda
// won't always implicitly convert to a std::function so instead we
@@ -139,7 +139,7 @@ struct _Deferred
// with variadic templates and lambdas, we still need to do
// preprocessor expansions. In addition, due to a bug with clang (or
// libc++) we can't use std::bind with a std::function so we have to
- // explicitely use the std::function<R(P...)>::operator() (see
+ // explicitly use the std::function<R(P...)>::operator() (see
// http://stackoverflow.com/questions/20097616/stdbind-to-a-stdfunction-crashes-with-clang).
#define TEMPLATE(Z, N, DATA) \
template <ENUM_PARAMS(N, typename P)> \
http://git-wip-us.apache.org/repos/asf/mesos/blob/6ce84cf2/3rdparty/libprocess/include/process/subprocess.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/subprocess.hpp b/3rdparty/libprocess/include/process/subprocess.hpp
index 8a3fe55..6ce1a82 100644
--- a/3rdparty/libprocess/include/process/subprocess.hpp
+++ b/3rdparty/libprocess/include/process/subprocess.hpp
@@ -67,7 +67,7 @@ public:
* Describes how the I/O is redirected for stdin/stdout/stderr.
* One of the following three modes are supported:
* 1. PIPE: Redirect to a pipe. The pipe will be created when
- * launching a subprocess and the the user can read/write the
+ * launching a subprocess and the user can read/write the
* parent side of the pipe using `Subprocess::in/out/err`.
* 2. PATH: Redirect to a file. For stdout/stderr, the file will
* be created if it does not exist. If the file exists, it