summaryrefslogtreecommitdiff
path: root/ace/Get_Opt.cpp
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2004-05-05 21:16:28 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2004-05-05 21:16:28 +0000
commitcfe0d0763c9095f05dac8be633e38820c8f21538 (patch)
treeae0c901f25d09e86445be7783f6071190d823ed2 /ace/Get_Opt.cpp
parent45a5a2249b80e4d967d655c72944c6a54bcbbd3a (diff)
downloadATCD-cfe0d0763c9095f05dac8be633e38820c8f21538.tar.gz
ChangeLogTag:Wed May 5 14:14:53 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'ace/Get_Opt.cpp')
-rw-r--r--ace/Get_Opt.cpp30
1 files changed, 16 insertions, 14 deletions
diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp
index 200ffbc54da..d3627e6edb4 100644
--- a/ace/Get_Opt.cpp
+++ b/ace/Get_Opt.cpp
@@ -1,4 +1,3 @@
-// Get_Opt.cpp
// $Id$
#include "ace/Get_Opt.h"
@@ -12,7 +11,9 @@
#include "ace/SString.h"
#include "ace/OS_NS_string.h"
-ACE_RCSID(ace, Get_Opt, "$Id$")
+ACE_RCSID (ace,
+ Get_Opt,
+ "$Id$")
/*
* Copyright (c) 1987, 1993, 1994
@@ -359,8 +360,8 @@ ACE_Get_Opt::short_option_i (void)
this->last_option (opt);
ACE_TCHAR *oli = 0;
- oli = ACE_const_cast (ACE_TCHAR*,
- ACE_OS::strchr (this->optstring_->c_str (), opt));
+ oli =
+ const_cast<ACE_TCHAR*> (ACE_OS::strchr (this->optstring_->c_str (), opt));
/* Increment `optind' when we start to process its last character. */
if (*this->nextchar_ == '\0')
@@ -490,9 +491,9 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name,
// If the short_option already exists, make sure it matches, otherwise
// add it.
ACE_TCHAR *s = 0;
- if ((s = ACE_const_cast (ACE_TCHAR*,
- ACE_OS::strchr (this->optstring_->c_str (),
- short_option))) != 0)
+ if ((s = const_cast<ACE_TCHAR*> (
+ ACE_OS::strchr (this->optstring_->c_str (),
+ short_option))) != 0)
{
// Short option exists, so verify the argument options
if (s[1] == ':')
@@ -703,22 +704,23 @@ ACE_Get_Opt::permute (void)
}
const ACE_TCHAR *
-ACE_Get_Opt::optstring (void) const
-{
+ACE_Get_Opt::optstring (void) const
+{
return this->optstring_->c_str ();
}
-ACE_Get_Opt::ACE_Get_Opt_Long_Option::ACE_Get_Opt_Long_Option (const ACE_TCHAR *name,
- int has_arg,
- int val)
- : name_ (ACE::strnew(name)),
+ACE_Get_Opt::ACE_Get_Opt_Long_Option::ACE_Get_Opt_Long_Option (
+ const ACE_TCHAR *name,
+ int has_arg,
+ int val)
+ : name_ (ACE::strnew (name)),
has_arg_ (has_arg),
val_ (val)
{}
ACE_Get_Opt::ACE_Get_Opt_Long_Option::~ACE_Get_Opt_Long_Option (void)
{
- delete [] ACE_const_cast (ACE_TCHAR*, this->name_);
+ delete [] this->name_;
}
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)