Merge branch 'master' of gitorious.org:stg/stg

[stg.git] / projects / stargazer / plugins / other / smux / utils.cpp

diff --git a/projects/stargazer/plugins/other/smux/utils.cpp b/projects/stargazer/plugins/other/smux/utils.cpp
index 91e40985cf154683dd2114cb97772fc17a97c349..3160bc5fcf6c33b5bc1d6729c80fb74e2a8f3f21 100644 (file)
--- a/projects/stargazer/plugins/other/smux/utils.cpp
+++ b/projects/stargazer/plugins/other/smux/utils.cpp
@@ -44,7 +44,7 @@ if (left < str.length())
         }
     arcs[arcPos++] = arc;
     }
         }
     arcs[arcPos++] = arc;
     }

-OBJECT_IDENTIFIER_set_arcs(oi, arcs, sizeof(arcs[0]), arcPos);
+OBJECT_IDENTIFIER_set_arcs(oi, arcs, sizeof(arcs[0]), static_cast<unsigned int>(arcPos));

 return true;
 }
 
 return true;
 }
 


@@ -79,9 +79,7 @@ memset(&msg, 0, sizeof(msg));
 
 msg.present = OpenPDU_PR_simple;
 asn_long2INTEGER(&msg.choice.simple.version, SimpleOpen__version_version_1);
 
 msg.present = OpenPDU_PR_simple;
 asn_long2INTEGER(&msg.choice.simple.version, SimpleOpen__version_version_1);

-std::string pen(PEN_PREFIX);
-pen += ".1";
-if (!String2OI(pen.c_str(), &msg.choice.simple.identity))
+if (!String2OI(PEN_PREFIX, &msg.choice.simple.identity))

     {
     printfd(__FILE__,
             "SendOpenPDU() - failed to convert string to OBJECT_IDENTIFIER\n");
     {
     printfd(__FILE__,
             "SendOpenPDU() - failed to convert string to OBJECT_IDENTIFIER\n");