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/06/06 20:01:12 UTC
[3/5] mesos git commit: Replaced `NULL` with `nullptr` in mesos
`/include`.
Replaced `NULL` with `nullptr` in mesos `/include`.
Review: https://reviews.apache.org/r/48253
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9c10384b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9c10384b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9c10384b
Branch: refs/heads/master
Commit: 9c10384bd7180a995cdf4766261d78afc0c13a22
Parents: 8fa85bb
Author: Michael Park <mp...@apache.org>
Authored: Sat Jun 4 17:38:03 2016 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Mon Jun 6 12:41:19 2016 -0700
----------------------------------------------------------------------
include/mesos/authorizer/authorizer.hpp | 20 ++++++++++----------
include/mesos/module.hpp | 2 +-
include/mesos/zookeeper/zookeeper.hpp | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9c10384b/include/mesos/authorizer/authorizer.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/authorizer/authorizer.hpp b/include/mesos/authorizer/authorizer.hpp
index 452a92b..02d0d04 100644
--- a/include/mesos/authorizer/authorizer.hpp
+++ b/include/mesos/authorizer/authorizer.hpp
@@ -46,20 +46,20 @@ public:
struct Object
{
Object()
- : value(NULL),
- framework_info(NULL),
- task(NULL),
- task_info(NULL),
- executor_info(NULL) {}
+ : value(nullptr),
+ framework_info(nullptr),
+ task(nullptr),
+ task_info(nullptr),
+ executor_info(nullptr) {}
Object(const authorization::Object& object)
- : value(object.has_value() ? &object.value() : NULL),
+ : value(object.has_value() ? &object.value() : nullptr),
framework_info(
- object.has_framework_info() ? &object.framework_info() : NULL),
- task(object.has_task() ? &object.task() : NULL),
- task_info(object.has_task_info() ? &object.task_info() : NULL),
+ object.has_framework_info() ? &object.framework_info() : nullptr),
+ task(object.has_task() ? &object.task() : nullptr),
+ task_info(object.has_task_info() ? &object.task_info() : nullptr),
executor_info(
- object.has_executor_info() ? &object.executor_info() : NULL) {}
+ object.has_executor_info() ? &object.executor_info() : nullptr) {}
const std::string* value;
const FrameworkInfo* framework_info;
http://git-wip-us.apache.org/repos/asf/mesos/blob/9c10384b/include/mesos/module.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/module.hpp b/include/mesos/module.hpp
index 30a9674..c28d01d 100644
--- a/include/mesos/module.hpp
+++ b/include/mesos/module.hpp
@@ -81,7 +81,7 @@ struct ModuleBase
const char* description;
// Callback invoked to check version compatibility. If this field
- // is NULL, backwards compatibility is disabled and the module
+ // is `nullptr`, backwards compatibility is disabled and the module
// version must match the Mesos release version exactly. If the
// macro is used, Mesos first checks backwards compatibility against
// its own internal table maintained by Mesos developers, then your
http://git-wip-us.apache.org/repos/asf/mesos/blob/9c10384b/include/mesos/zookeeper/zookeeper.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/zookeeper/zookeeper.hpp b/include/mesos/zookeeper/zookeeper.hpp
index 3b68957..d4723dd 100644
--- a/include/mesos/zookeeper/zookeeper.hpp
+++ b/include/mesos/zookeeper/zookeeper.hpp
@@ -247,7 +247,7 @@ public:
* \param watch if nonzero, a watch will be set at the server to
* notify the client if the node changes.
* \param result the data returned by the server
- * \param stat if not NULL, will hold the value of stat for the path
+ * \param stat if not `nullptr`, will hold the value of stat for the path
* on return.
* \return return value of the function call.
* ZOK operation completed successfully