fix(FAM): Fam_Descriptor_Status issue

ecmwf · Nov 6, 2024 · 4ffb14a · 4ffb14a
1 parent a6b564d
commit 4ffb14a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/eckit/io/fam/FamObject.cc b/src/eckit/io/fam/FamObject.cc
@@ -66,7 +66,7 @@ void FamObject::deallocate() const {
 }
 
 auto FamObject::exists() const -> bool {
-    return (object_->get_desc_status() != Fam_Descriptor_Status::DESC_INVALID);
+    return (object_->get_desc_status() != FamDescriptorStatus::DESC_INVALID);
 }
 
 //----------------------------------------------------------------------------------------------------------------------

diff --git a/src/eckit/io/fam/FamRegion.cc b/src/eckit/io/fam/FamRegion.cc
@@ -52,7 +52,7 @@ void FamRegion::destroy() const {
 }
 
 auto FamRegion::exists() const -> bool {
-    return (region_->get_desc_status() != Fam_Descriptor_Status::DESC_INVALID);
+    return (region_->get_desc_status() != FamDescriptorStatus::DESC_INVALID);
 }
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -106,10 +106,10 @@ void FamRegion::deallocateObject(const std::string& objectName) const {
 void FamRegion::print(std::ostream& out) const {
     out << "FamRegion[" << property() << ",status=";
     switch (region_->get_desc_status()) {
-        case Fam_Descriptor_Status::DESC_INVALID:                     out << "invalid"; break;
-        case Fam_Descriptor_Status::DESC_INIT_DONE:                   out << "initialized"; break;
-        case Fam_Descriptor_Status::DESC_INIT_DONE_BUT_KEY_NOT_VALID: out << "initialized_invalidkey"; break;
-        case Fam_Descriptor_Status::DESC_UNINITIALIZED:               out << "uninitialized"; break;
+        case FamDescriptorStatus::DESC_INVALID:                       out << "invalid"; break;
+        case FamDescriptorStatus::DESC_INIT_DONE:                     out << "initialized"; break;
+        case FamDescriptorStatus::DESC_INIT_DONE_BUT_KEY_NOT_VALID:   out << "initialized_invalidkey"; break;
+        case FamDescriptorStatus::DESC_UNINITIALIZED:                 out << "uninitialized"; break;
         default:                                                      out << "unknown"; break;
     }
     out << "]";

diff --git a/src/eckit/io/fam/detail/FamSessionDetail.h b/src/eckit/io/fam/detail/FamSessionDetail.h
@@ -31,6 +31,8 @@
 
 namespace eckit {
 
+using FamDescriptorStatus = openfam::Fam_Descriptor_Status;
+
 //----------------------------------------------------------------------------------------------------------------------
 // SESSION