X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c61e30e8ce6bb4959cb289359a184b6de94ffd6..cc79d648c6fd0e8fc281e263c24fe72adbe59769:/src/surf/StorageImpl.cpp diff --git a/src/surf/StorageImpl.cpp b/src/surf/StorageImpl.cpp index 31851772ae..8821467df8 100644 --- a/src/surf/StorageImpl.cpp +++ b/src/surf/StorageImpl.cpp @@ -47,13 +47,13 @@ StorageImpl::StorageImpl(kernel::resource::Model* model, const std::string& name { StorageImpl::turn_on(); XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size); - constraintRead_ = maxminSystem->constraint_new(this, bread); - constraintWrite_ = maxminSystem->constraint_new(this, bwrite); + constraint_read_ = maxminSystem->constraint_new(this, bread); + constraint_write_ = maxminSystem->constraint_new(this, bwrite); } StorageImpl::~StorageImpl() { - xbt_assert(currentlyDestroying_, "Don't delete Storages directly. Call destroy() instead."); + xbt_assert(currently_destroying_, "Don't delete Storages directly. Call destroy() instead."); } /** @brief Fire the required callbacks and destroy the object @@ -62,8 +62,8 @@ StorageImpl::~StorageImpl() */ void StorageImpl::destroy() { - if (not currentlyDestroying_) { - currentlyDestroying_ = true; + if (not currently_destroying_) { + currently_destroying_ = true; s4u::Storage::on_destruction(this->piface_); delete this; }