summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-05-15 04:36:09 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-05-15 04:36:09 +0000
commitdb8a2a710ac60e4c013d6083b875d0ba68f3d639 (patch)
treed19f48efe693c6b888d3106d5a9d6ba697e14bcc
parentc53a7e71059689a5f1b67d2deabafe6d5aec93da (diff)
downloadATCD-db8a2a710ac60e4c013d6083b875d0ba68f3d639.tar.gz
*** empty log message ***
-rw-r--r--ace/Service_Config.i2
-rw-r--r--ace/Svc_Conf.h2
-rw-r--r--ace/Svc_Conf.l2
-rw-r--r--ace/Svc_Conf_l.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/ace/Service_Config.i b/ace/Service_Config.i
index ae3c0bd2704..309bce5f127 100644
--- a/ace/Service_Config.i
+++ b/ace/Service_Config.i
@@ -19,7 +19,7 @@ ACE_Service_Config::open (int argc,
// Compare two service descriptors for equality.
ACE_INLINE int
-ACE_Static_Svc_Descriptor::operator== (struct ACE_Static_Svc_Descriptor &d) const
+ACE_Static_Svc_Descriptor::operator== (ACE_Static_Svc_Descriptor &d) const
{
return ACE_OS::strcmp (name_, d.name_) == 0;
}
diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index 817c2240315..4679583c2db 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -71,7 +71,7 @@ extern int ace_yylineno;
extern int ace_yyerrno;
// Keeps track of the number of errors encountered so far
-extern char *ace_yydirective;
+extern const ASYS_TCHAR ace_yydirective;
// Used to parse service configurator directives from a string rather
// than from a svc.conf file.
diff --git a/ace/Svc_Conf.l b/ace/Svc_Conf.l
index f128cec1974..adf174f3da0 100644
--- a/ace/Svc_Conf.l
+++ b/ace/Svc_Conf.l
@@ -14,7 +14,7 @@ int yyerrno = 0;
// Used to parse service configurator directives from a string rather
// than from a svc.conf file.
-char *yydirective = 0;
+const ASYS_TCHAR *yydirective = 0;
#define token(x) x
%}
diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp
index 5b7fa4b6271..b90ffe4ec28 100644
--- a/ace/Svc_Conf_l.cpp
+++ b/ace/Svc_Conf_l.cpp
@@ -504,7 +504,7 @@ int ace_yyerrno = 0;
// Used to parse service configurator directives from a string rather
// than from a svc.conf file.
-char *ace_yydirective = 0;
+const ASYS_TCHAR *ace_yydirective = 0;
#define token(x) x