1 files changed, 10 insertions, 10 deletions

diff --git a/ASNMP/examples/set/set.cpp b/ASNMP/examples/set/set.cpp
index 39eb447f9a7..938a385c4e2 100644
--- a/ASNMP/examples/set/set.cpp
+++ b/ASNMP/examples/set/set.cpp
@@ -66,7 +66,7 @@ class set {
 
 
 // main entry point
-int main( int argc, char *argv[])
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[])
 {
   set get(argc, argv);
   if (get.valid())
@@ -97,22 +97,22 @@ set::set(int argc, char *argv[]): valid_(0)
    }
 
    ACE_Argv_Type_Converter to_tchar (argc, argv);
-   ACE_Get_Opt get_opt (argc,
-                        to_tchar.get_TCHAR_argv (),
-                        ACE_TEXT ("o:c:r:t:I:U:C:G:T:O:S:P:"));
+   ACE_Get_Arg_Opt<char> get_opt (argc,
+                         to_tchar.get_TCHAR_argv (),
+                         ACE_TEXT ("o:c:r:t:I:U:C:G:T:O:S:P:"));
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'o':
-         req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          if (req.valid() == 0)
          cout << "ERROR: oid value: "
-              << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
+              << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())
               << "is not valid. using default.\n";
          break;
 
        case 'c':
-         community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          target_.set_write_community(community_);
          break;
 
@@ -166,14 +166,14 @@ set::set(int argc, char *argv[]): valid_(0)
 
        case 'O': // Oid as a variable identifier
         {
-         oid_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         oid_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          vb.set_oid(oid_); // when value is set, pdu updated
          }
          break;
 
        case 'S': // Octet String
          {
-         OctetStr o(ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()));
+         OctetStr o(ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
          vb.set_value(o);                    // set the Oid portion of the Vb
          pdu_ += vb;
          }
@@ -181,7 +181,7 @@ set::set(int argc, char *argv[]): valid_(0)
 
        case 'P': // Oid String as a value
          {
-         Oid o(ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()));
+         Oid o(ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
          vb.set_value(o);                    // set the Oid portion of the Vb
          pdu_ += vb;
          }