From 590318407e836806e085a6083479cb940668e5f9 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 2 Apr 2021 23:03:11 +0200 Subject: [PATCH] A bool is OK in boolean context. --- src/kernel/routing/NetZoneImpl.cpp | 12 ++++++------ src/smpi/include/private.hpp | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index 11c3363828..6caa24615a 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -484,38 +484,38 @@ void NetZoneImpl::seal() void NetZoneImpl::set_parent(NetZoneImpl* parent) { - xbt_assert(sealed_ == false, "Impossible to set parent to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set parent to an already sealed NetZone(%s)", this->get_cname()); parent_ = parent; netpoint_->set_englobing_zone(parent_); } void NetZoneImpl::set_network_model(std::shared_ptr netmodel) { - xbt_assert(sealed_ == false, "Impossible to set network model to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set network model to an already sealed NetZone(%s)", this->get_cname()); network_model_ = std::move(netmodel); } void NetZoneImpl::set_cpu_vm_model(std::shared_ptr cpu_model) { - xbt_assert(sealed_ == false, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname()); cpu_model_vm_ = std::move(cpu_model); } void NetZoneImpl::set_cpu_pm_model(std::shared_ptr cpu_model) { - xbt_assert(sealed_ == false, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname()); cpu_model_pm_ = std::move(cpu_model); } void NetZoneImpl::set_disk_model(std::shared_ptr disk_model) { - xbt_assert(sealed_ == false, "Impossible to set disk model to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set disk model to an already sealed NetZone(%s)", this->get_cname()); disk_model_ = std::move(disk_model); } void NetZoneImpl::set_host_model(std::shared_ptr host_model) { - xbt_assert(sealed_ == false, "Impossible to set host model to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set host model to an already sealed NetZone(%s)", this->get_cname()); host_model_ = std::move(host_model); } diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index e8906051ad..fe6bd5ad5f 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -537,8 +537,7 @@ XBT_PRIVATE void private_execute_flops(double flops); #define CHECK_COMM2(num, comm) \ CHECK_MPI_NULL((num), MPI_COMM_NULL, MPI_ERR_COMM, (comm)) #define CHECK_DELETED(num, err, obj) \ - CHECK_ARGS((obj->deleted() == true), (err), \ - "%s: param %d %s has already been freed", __func__, (num), _XBT_STRINGIFY(obj)); + CHECK_ARGS((obj)->deleted(), (err), "%s: param %d %s has already been freed", __func__, (num), _XBT_STRINGIFY(obj)); #define CHECK_COMM(num) \ CHECK_COMM2((num), comm) \ CHECK_DELETED((num), MPI_ERR_COMM, comm) -- 2.20.1