Each SI _instance_ do have a list of CSIs, what do you mean? I think this patch is wrong... Thanks, Hans
> -----Original Message----- > From: Gary Lee [mailto:[email protected]] > Sent: den 26 juni 2014 04:11 > To: Hans Feldt; Hans Nordebäck; [email protected] > Cc: [email protected] > Subject: [PATCH 1 of 1] amfd: Convert remove_csi and add_csi to static member > functions [#713] > > osaf/services/saf/amf/amfd/csi.cc | 4 ++-- > osaf/services/saf/amf/amfd/include/si.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > > These functions don't operate directly on "this" SI instance. > Let's make them static member functions for now. > > diff --git a/osaf/services/saf/amf/amfd/csi.cc > b/osaf/services/saf/amf/amfd/csi.cc > --- a/osaf/services/saf/amf/amfd/csi.cc > +++ b/osaf/services/saf/amf/amfd/csi.cc > @@ -39,7 +39,7 @@ void avd_csi_delete(AVD_CSI *csi) > } > > avd_cstype_remove_csi(csi); > - csi->si->remove_csi(csi); > + AVD_SI::remove_csi(csi); > > csi_db->erase(Amf::to_string(&csi->name)); > > @@ -322,7 +322,7 @@ static void csi_get_attr_and_add_to_mode > csi->si = avd_si_get(si_name); > > avd_cstype_add_csi(csi); > - csi->si->add_csi(csi); > + AVD_SI::add_csi(csi); > > rc = 0; > > diff --git a/osaf/services/saf/amf/amfd/include/si.h > b/osaf/services/saf/amf/amfd/include/si.h > --- a/osaf/services/saf/amf/amfd/include/si.h > +++ b/osaf/services/saf/amf/amfd/include/si.h > @@ -128,8 +128,8 @@ public: > uint32_t pref_standby_assignments() const; > uint32_t curr_standby_assignments() const; > > - void add_csi(struct avd_csi_tag* csi); > - void remove_csi(struct avd_csi_tag *csi); > + static void add_csi(struct avd_csi_tag* csi); > + static void remove_csi(struct avd_csi_tag *csi); > > void delete_assignments(AVD_CL_CB *cb); > void delete_csis(); ------------------------------------------------------------------------------ Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
