[devel] [PATCH 1/1] smf: Fix c-linkage and string op errors V3 [#3065]

[Thanh Nguyen]

- Fix faults in C linkage in file
  src/smf/smfd/SmfUtils.h.
- Fix fault in string concatenation in file
  src/smf/smfd/SmfUpgradeCampaign.cc
---
 src/smf/smfd/SmfUpgradeCampaign.cc | 3 ++-
 src/smf/smfd/SmfUtils.h            | 7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/smf/smfd/SmfUpgradeCampaign.cc 
b/src/smf/smfd/SmfUpgradeCampaign.cc
index 3c50bf7..4a1591a 100644
--- a/src/smf/smfd/SmfUpgradeCampaign.cc
+++ b/src/smf/smfd/SmfUpgradeCampaign.cc
@@ -930,7 +930,8 @@ void SmfUpgradeCampaign::continueExec() {
     if (o_result == true) {
       LOG_NO("The campaign have been restarted to many times");
       int cnt = smfd_cb->smfCampMaxRestart;
-      std::string error = "To many campaign restarts, max " + cnt;
+      std::string error = "To many campaign restarts, max "
+          + std::to_string(cnt);
       SmfCampaignThread::instance()->campaign()->setError(error);
       changeState(SmfCampStateExecFailed::instance());
       TRACE_LEAVE();
diff --git a/src/smf/smfd/SmfUtils.h b/src/smf/smfd/SmfUtils.h
index 894e3c9..83ce6ec 100644
--- a/src/smf/smfd/SmfUtils.h
+++ b/src/smf/smfd/SmfUtils.h
@@ -51,10 +51,6 @@ class SmfRollbackCcb;
  *   DATA DECLARATIONS
  * ========================================================================
  */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern bool smf_stringToImmType(char* i_type, SaImmValueTypeT& o_type);
 extern const char* smf_immTypeToString(SaImmValueTypeT i_type);
 extern SaImmAttrModificationTypeT smf_stringToImmAttrModType(char* i_type);
@@ -74,9 +70,6 @@ extern const std::string smfStateToString(const uint32_t& 
i_stateId,
 extern bool compare_du_part(unitNameAndState& first, unitNameAndState& second);
 extern bool unique_du_part(unitNameAndState& first, unitNameAndState& second);
 
-#ifdef __cplusplus
-}
-#endif
 extern bool waitForNodeDestination(const std::string& i_node,
                                    SmfndNodeDest* o_nodeDest);
 extern bool getNodeDestination(const std::string& i_node,
-- 
2.7.4



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