[devel] [PATCH 3 of 3] amfd: remove cast from avd_saImmOiRtObjectCreate [#713]

[Hans Feldt]

 osaf/services/saf/amf/amfd/csi.cc        |  3 +--
 osaf/services/saf/amf/amfd/imm.cc        |  2 +-
 osaf/services/saf/amf/amfd/include/imm.h |  2 +-
 osaf/services/saf/amf/amfd/siass.cc      |  3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)


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
@@ -1000,8 +1000,7 @@ static void avd_create_csiassignment_in_
        avsv_create_association_class_dn(comp_dn, NULL, "safCSIComp", &dn);
 
        TRACE("Adding %s", dn.value);
-       
avd_saImmOiRtObjectCreate(const_cast<SaImmClassNameT>("SaAmfCSIAssignment"),
-                       csi_dn, attrValues);
+       avd_saImmOiRtObjectCreate("SaAmfCSIAssignment", csi_dn, attrValues);
 }
 
 AVD_COMP_CSI_REL *avd_compcsi_create(AVD_SU_SI_REL *susi, AVD_CSI *csi,
diff --git a/osaf/services/saf/amf/amfd/imm.cc 
b/osaf/services/saf/amf/amfd/imm.cc
--- a/osaf/services/saf/amf/amfd/imm.cc
+++ b/osaf/services/saf/amf/amfd/imm.cc
@@ -1510,7 +1510,7 @@ void avd_saImmOiRtObjectUpdate(const SaN
  * @param parentName
  * @param attrValues
  */
-void avd_saImmOiRtObjectCreate(const SaImmClassNameT className,
+void avd_saImmOiRtObjectCreate(const char *className,
        const SaNameT *parentName, const SaImmAttrValuesT_2 **attrValues)
 {
        TRACE_ENTER();
diff --git a/osaf/services/saf/amf/amfd/include/imm.h 
b/osaf/services/saf/amf/amfd/include/imm.h
--- a/osaf/services/saf/amf/amfd/include/imm.h
+++ b/osaf/services/saf/amf/amfd/include/imm.h
@@ -137,7 +137,7 @@ extern void avd_saImmOiRtObjectUpdate_sy
        SaImmAttrNameT attributeName, SaImmValueTypeT attrValueType, void 
*value);
 extern void avd_saImmOiRtObjectUpdate(const SaNameT* dn, const char 
*attributeName,
      SaImmValueTypeT attrValueType, void* value);
-extern void avd_saImmOiRtObjectCreate(const SaImmClassNameT className,
+extern void avd_saImmOiRtObjectCreate(const char *className,
        const SaNameT *parentName, const SaImmAttrValuesT_2 **attrValues);
 extern void avd_saImmOiRtObjectDelete(const SaNameT* objectName);
 
diff --git a/osaf/services/saf/amf/amfd/siass.cc 
b/osaf/services/saf/amf/amfd/siass.cc
--- a/osaf/services/saf/amf/amfd/siass.cc
+++ b/osaf/services/saf/amf/amfd/siass.cc
@@ -77,8 +77,7 @@ static void avd_create_susi_in_imm(SaAmf
                return;
 
        avsv_create_association_class_dn(su_dn, NULL, "safSISU", &dn);
-       
avd_saImmOiRtObjectCreate(const_cast<SaImmClassNameT>("SaAmfSIAssignment"),
-                       si_dn, attrValues);
+       avd_saImmOiRtObjectCreate("SaAmfSIAssignment", si_dn, attrValues);
 }
 
 /** Delete an SaAmfSIAssignment from IMM

------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel