summaryrefslogtreecommitdiff
path: root/ace/Get_Opt.cpp
diff options
context:
space:
mode:
authorbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-04-23 04:43:59 +0000
committerbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-04-23 04:43:59 +0000
commitf40cc79fed36173f3588f26d7bec8ee7705dc153 (patch)
tree61d38d262d43ac77fc2ad94c9e7e850cd5607622 /ace/Get_Opt.cpp
parent2afe8d4640d7b30bfe959c16212ea87df8e6ec7c (diff)
downloadATCD-f40cc79fed36173f3588f26d7bec8ee7705dc153.tar.gz
ChangeLogTag:Sat Apr 22 20:53:11 2000 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'ace/Get_Opt.cpp')
-rw-r--r--ace/Get_Opt.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp
index b0667aca8f3..b23c3ad2186 100644
--- a/ace/Get_Opt.cpp
+++ b/ace/Get_Opt.cpp
@@ -45,8 +45,8 @@ ACE_RCSID(ace, Get_Opt, "$Id$")
ACE_ALLOC_HOOK_DEFINE(ACE_Get_Opt)
ACE_Get_Opt::ACE_Get_Opt (int argc,
- ASYS_TCHAR **argv,
- const ASYS_TCHAR *optstring,
+ ACE_TCHAR **argv,
+ const ACE_TCHAR *optstring,
int skip,
int report_errors)
: optarg (0),
@@ -66,7 +66,7 @@ ACE_Get_Opt::dump (void) const
ACE_TRACE ("ACE_Get_Opt::dump");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
- ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
}
@@ -83,7 +83,7 @@ ACE_Get_Opt::operator () (void)
}
int opt; // Character checked for validity.
- const ASYS_TCHAR *oli; // Option letter index.
+ const ACE_TCHAR *oli; // Option letter index.
if (this->nextchar_ == 0 || *this->nextchar_ == '\0')
{
@@ -92,7 +92,7 @@ ACE_Get_Opt::operator () (void)
if (this->optind >= this->argc_
|| *(this->nextchar_ = this->argv_[this->optind]) != '-')
{
- this->nextchar_ = ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT (""));
+ this->nextchar_ = ACE_const_cast (ACE_TCHAR *, ACE_TEXT (""));
return EOF;
}
@@ -101,7 +101,7 @@ ACE_Get_Opt::operator () (void)
{
// Found "--".
++this->optind;
- this->nextchar_ = ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT (""));
+ this->nextchar_ = ACE_const_cast (ACE_TCHAR *, ACE_TEXT (""));
return EOF;
}
}
@@ -122,7 +122,7 @@ ACE_Get_Opt::operator () (void)
if (this->opterr && *this->optstring_ != ':')
ACE_ERROR ((LM_ERROR,
- ASYS_TEXT ("%s: illegal option -- %c\n"),
+ ACE_TEXT ("%s: illegal option -- %c\n"),
this->argv_[0],
opt));
return '?';
@@ -141,20 +141,20 @@ ACE_Get_Opt::operator () (void)
else if (this->argc_ <= ++this->optind)
{
// No arg.
- this->nextchar_ = ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT (""));
+ this->nextchar_ = ACE_const_cast (ACE_TCHAR *, ACE_TEXT (""));
if (*this->optstring_ == ':')
return ':';
if (this->opterr)
ACE_ERROR ((LM_ERROR,
- ASYS_TEXT ("%s: option requires an argument -- %c\n"),
+ ACE_TEXT ("%s: option requires an argument -- %c\n"),
this->argv_[0], opt));
return '?';
}
else // White space.
this->optarg = this->argv_[this->optind];
- this->nextchar_ = ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT (""));
+ this->nextchar_ = ACE_const_cast (ACE_TCHAR *, ACE_TEXT (""));
++this->optind;
}