Skip to content

MINOR : [C++] Replace NULLPTR with nullptr inside registry.cc #50118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andishgar wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −13
Open

MINOR : [C++] Replace NULLPTR with nullptr inside registry.cc #50118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions cpp/src/arrow/compute/registry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,34 +35,34 @@ 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));
}
return DoAddAlias(target_name, source_name, /*add=*/false);
}

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));
}
Expand All @@ -71,15 +71,15 @@ 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);
}

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);
Expand All @@ -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);
Expand All @@ -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_) {
Expand All @@ -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);
Expand All @@ -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());
}

Expand All @@ -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) {
Expand All @@ -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) {
Expand Down
Loading