This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new ee0d861d2b MINOR: [C++] Replace NULLPTR with nullptr inside
registry.cc (#50118)
ee0d861d2b is described below
commit ee0d861d2bf342272920ae7213b594a18154f7bf
Author: Arash Andishgar <[email protected]>
AuthorDate: Thu Jun 11 03:29:24 2026 +0330
MINOR: [C++] Replace NULLPTR with nullptr inside registry.cc (#50118)
### Rationale for this change
As mentioned
[here](https://arrow.apache.org/docs/developers/cpp/development.html#code-style-linting-and-ci),
`NULLPTR` must be used in headers. However, `NULLPTR` is used inside
`arrow/compute/registry.cc` instead of `nullptr`.
### What changes are included in this PR?
Replace `NULLPTR` with `nullptr`.
### Are these changes tested?
Yes, I ran the unit tests.
### Are there any user-facing changes?
No.
Authored-by: arash andishgar <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
---
cpp/src/arrow/compute/registry.cc | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/cpp/src/arrow/compute/registry.cc
b/cpp/src/arrow/compute/registry.cc
index be0ebd3201..ad6e044177 100644
--- a/cpp/src/arrow/compute/registry.cc
+++ b/cpp/src/arrow/compute/registry.cc
@@ -35,26 +35,26 @@ namespace compute {
class FunctionRegistry::FunctionRegistryImpl {
public:
- explicit FunctionRegistryImpl(FunctionRegistryImpl* parent = NULLPTR)
+ explicit FunctionRegistryImpl(FunctionRegistryImpl* parent = nullptr)
: parent_(parent) {}
~FunctionRegistryImpl() {}
Status CanAddFunction(std::shared_ptr<Function> function, bool
allow_overwrite) {
- if (parent_ != NULLPTR) {
+ if (parent_ != nullptr) {
RETURN_NOT_OK(parent_->CanAddFunction(function, allow_overwrite));
}
return DoAddFunction(function, allow_overwrite, /*add=*/false);
}
Status AddFunction(std::shared_ptr<Function> function, bool allow_overwrite)
{
- if (parent_ != NULLPTR) {
+ if (parent_ != nullptr) {
RETURN_NOT_OK(parent_->CanAddFunction(function, allow_overwrite));
}
return DoAddFunction(function, allow_overwrite, /*add=*/true);
}
Status CanAddAlias(const std::string& target_name, const std::string&
source_name) {
- if (parent_ != NULLPTR) {
+ if (parent_ != nullptr) {
RETURN_NOT_OK(parent_->CanAddFunctionName(target_name,
/*allow_overwrite=*/false));
}
@@ -62,7 +62,7 @@ class FunctionRegistry::FunctionRegistryImpl {
}
Status AddAlias(const std::string& target_name, const std::string&
source_name) {
- if (parent_ != NULLPTR) {
+ if (parent_ != nullptr) {
RETURN_NOT_OK(parent_->CanAddFunctionName(target_name,
/*allow_overwrite=*/false));
}
@@ -71,7 +71,7 @@ class FunctionRegistry::FunctionRegistryImpl {
Status CanAddFunctionOptionsType(const FunctionOptionsType* options_type,
bool allow_overwrite = false) {
- if (parent_ != NULLPTR) {
+ if (parent_ != nullptr) {
RETURN_NOT_OK(parent_->CanAddFunctionOptionsType(options_type,
allow_overwrite));
}
return DoAddFunctionOptionsType(options_type, allow_overwrite,
/*add=*/false);
@@ -79,7 +79,7 @@ class FunctionRegistry::FunctionRegistryImpl {
Status AddFunctionOptionsType(const FunctionOptionsType* options_type,
bool allow_overwrite = false) {
- if (parent_ != NULLPTR) {
+ if (parent_ != nullptr) {
RETURN_NOT_OK(parent_->CanAddFunctionOptionsType(options_type,
allow_overwrite));
}
return DoAddFunctionOptionsType(options_type, allow_overwrite,
/*add=*/true);
@@ -88,7 +88,7 @@ class FunctionRegistry::FunctionRegistryImpl {
Result<std::shared_ptr<Function>> GetFunction(const std::string& name) const
{
auto it = name_to_function_.find(name);
if (it == name_to_function_.end()) {
- if (parent_ != NULLPTR) {
+ if (parent_ != nullptr) {
return parent_->GetFunction(name);
}
return Status::KeyError("No function registered with name: ", name);
@@ -98,7 +98,7 @@ class FunctionRegistry::FunctionRegistryImpl {
std::vector<std::string> GetFunctionNames() const {
std::vector<std::string> results;
- if (parent_ != NULLPTR) {
+ if (parent_ != nullptr) {
results = parent_->GetFunctionNames();
}
for (auto it : name_to_function_) {
@@ -112,7 +112,7 @@ class FunctionRegistry::FunctionRegistryImpl {
const std::string& name) const {
auto it = name_to_options_type_.find(name);
if (it == name_to_options_type_.end()) {
- if (parent_ != NULLPTR) {
+ if (parent_ != nullptr) {
return parent_->GetFunctionOptionsType(name);
}
return Status::KeyError("No function options type registered with name:
", name);
@@ -121,7 +121,7 @@ class FunctionRegistry::FunctionRegistryImpl {
}
int num_functions() const {
- return (parent_ == NULLPTR ? 0 : parent_->num_functions()) +
+ return (parent_ == nullptr ? 0 : parent_->num_functions()) +
static_cast<int>(name_to_function_.size());
}
@@ -130,7 +130,7 @@ class FunctionRegistry::FunctionRegistryImpl {
private:
// must not acquire mutex
Status CanAddFunctionName(const std::string& name, bool allow_overwrite) {
- if (parent_ != NULLPTR) {
+ if (parent_ != nullptr) {
RETURN_NOT_OK(parent_->CanAddFunctionName(name, allow_overwrite));
}
if (!allow_overwrite) {
@@ -144,7 +144,7 @@ class FunctionRegistry::FunctionRegistryImpl {
// must not acquire mutex
Status CanAddOptionsTypeName(const std::string& name, bool allow_overwrite) {
- if (parent_ != NULLPTR) {
+ if (parent_ != nullptr) {
RETURN_NOT_OK(parent_->CanAddOptionsTypeName(name, allow_overwrite));
}
if (!allow_overwrite) {
