diff options
Diffstat (limited to 'ASNMP/examples')
-rw-r--r-- | ASNMP/examples/get/get.cpp | 14 | ||||
-rw-r--r-- | ASNMP/examples/get/get_async.cpp | 14 | ||||
-rw-r--r-- | ASNMP/examples/next/next.cpp | 14 | ||||
-rw-r--r-- | ASNMP/examples/set/set.cpp | 20 | ||||
-rw-r--r-- | ASNMP/examples/trap/trap.cpp | 14 | ||||
-rw-r--r-- | ASNMP/examples/walk/walk.cpp | 14 |
6 files changed, 45 insertions, 45 deletions
diff --git a/ASNMP/examples/get/get.cpp b/ASNMP/examples/get/get.cpp index ff6fcb9681f..a633059a08c 100644 --- a/ASNMP/examples/get/get.cpp +++ b/ASNMP/examples/get/get.cpp @@ -67,7 +67,7 @@ class getapp { // main entry point -int main( int argc, char *argv[]) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[]) { getapp get(argc, argv); if (get.valid()) @@ -95,22 +95,22 @@ getapp::getapp(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:p:")); + ACE_Get_Arg_Opt<char> get_opt (argc, + to_tchar.get_TCHAR_argv (), + ACE_TEXT ("o:c:r:t: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_read_community(community_); break; diff --git a/ASNMP/examples/get/get_async.cpp b/ASNMP/examples/get/get_async.cpp index 8217ffabac1..ee9c9791d39 100644 --- a/ASNMP/examples/get/get_async.cpp +++ b/ASNMP/examples/get/get_async.cpp @@ -67,7 +67,7 @@ class getapp : public Snmp_Result { // main entry point -int main( int argc, char *argv[]) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[]) { getapp get(argc, argv); if (get.valid()) @@ -95,22 +95,22 @@ getapp::getapp(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:p:")); + ACE_Get_Arg_Opt<char> get_opt (argc, + to_tchar.get_TCHAR_argv (), + ACE_TEXT ("o:c:r:t: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_read_community(community_); break; diff --git a/ASNMP/examples/next/next.cpp b/ASNMP/examples/next/next.cpp index 7a9a2208ca2..0ec2a7fc945 100644 --- a/ASNMP/examples/next/next.cpp +++ b/ASNMP/examples/next/next.cpp @@ -66,7 +66,7 @@ class nextapp { // main entry point -int main( int argc, char *argv[]) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[]) { nextapp get(argc, argv); if (get.valid()) @@ -94,22 +94,22 @@ nextapp::nextapp(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:")); + ACE_Get_Arg_Opt<char> get_opt (argc, + to_tchar.get_TCHAR_argv (), + ACE_TEXT ("o:c:r:t:")); 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_read_community(community_); break; 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; } diff --git a/ASNMP/examples/trap/trap.cpp b/ASNMP/examples/trap/trap.cpp index 59d4f9f25bc..bfba5d3552e 100644 --- a/ASNMP/examples/trap/trap.cpp +++ b/ASNMP/examples/trap/trap.cpp @@ -68,7 +68,7 @@ class trapapp { // main entry point -int main( int argc, char *argv[]) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[]) { trapapp get(argc, argv); if (get.valid()) @@ -98,23 +98,23 @@ trapapp::trapapp(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 ("c:e:t:")); + ACE_Get_Arg_Opt<char> get_opt (argc, + to_tchar.get_TCHAR_argv (), + ACE_TEXT ("c:e:t:")); for (int c; (c = get_opt ()) != -1; ) switch (c) { case 'c': // community string - community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); target_.set_read_community(community_); break; case 'e': // trap oid to send - ent = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + ent = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); break; case 't': // trap oid - trap = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + trap = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); break;; default: diff --git a/ASNMP/examples/walk/walk.cpp b/ASNMP/examples/walk/walk.cpp index 56fc112fd71..75d62fa66f7 100644 --- a/ASNMP/examples/walk/walk.cpp +++ b/ASNMP/examples/walk/walk.cpp @@ -65,7 +65,7 @@ class walkapp { // main entry point -int main( int argc, char *argv[]) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[]) { walkapp get(argc, argv); if (get.valid()) @@ -94,22 +94,22 @@ walkapp::walkapp(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:")); + ACE_Get_Arg_Opt<char> get_opt (argc, + to_tchar.get_TCHAR_argv (), + ACE_TEXT ("o:c:r:t:")); 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_read_community(community_); break; |