summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1999-06-07 07:45:57 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1999-06-07 07:45:57 +0000
commit9cf699859a5763960714e5c56211662089cecbea (patch)
tree17d838ced4c83cc133f29396f4d73525ae1ca5ed /ace
parentbc02a5b312f6c2b9d6c2e682e523dabe90eee3ce (diff)
downloadATCD-9cf699859a5763960714e5c56211662089cecbea.tar.gz
.
Diffstat (limited to 'ace')
-rw-r--r--ace/Naming_Context.cpp2
-rw-r--r--ace/Naming_Context.h4
-rw-r--r--ace/TTY_IO.h5
3 files changed, 6 insertions, 5 deletions
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index a563091d829..b165a601ac9 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -564,7 +564,7 @@ ACE_Name_Options::verbose (void)
}
void
-ACE_Name_Options::parse_args (int argc, const char *argv[])
+ACE_Name_Options::parse_args (int argc, char *argv[])
{
ACE_TRACE ("ACE_Name_Options::parse_args");
ACE_LOG_MSG->open (argv[0]);
diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h
index a2595fbea2a..078d35356cb 100644
--- a/ace/Naming_Context.h
+++ b/ace/Naming_Context.h
@@ -255,8 +255,8 @@ public:
~ACE_Name_Options (void);
void parse_args (int argc,
- const char *argv[]);
- // Parse arguments
+ char *argv[]);
+ // Parse arguments.
// = Set/Get port number
void nameserver_port (int port);
diff --git a/ace/TTY_IO.h b/ace/TTY_IO.h
index 82d1d25abb5..404ffaa9b12 100644
--- a/ace/TTY_IO.h
+++ b/ace/TTY_IO.h
@@ -52,7 +52,7 @@ public:
{
int baudrate;
int parityenb;
- char *paritymode;
+ const char *paritymode;
int databits;
int stopbits;
int readtimeoutmsec;
@@ -60,7 +60,8 @@ public:
int rcvenb;
};
- int control (Control_Mode cmd, Serial_Params * arg) const;
+ int control (Control_Mode cmd,
+ Serial_Params *arg) const;
// Interface for reading/writing serial device parameters.
#if defined (ACE_NEEDS_DEV_IO_CONVERSION)