summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1997-09-11 22:53:34 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1997-09-11 22:53:34 +0000
commitb28d9da6e806044a8f8079cc902d3b295b4d484f (patch)
tree6f8b0ca83de412e8c2595019d049922a87a40cab
parent85dc3fff4f3b832229693883e4dbd69bcb7500c5 (diff)
downloadATCD-b28d9da6e806044a8f8079cc902d3b295b4d484f.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog-97b7
-rw-r--r--ace/Svc_Conf.y10
2 files changed, 8 insertions, 9 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b
index 11c3e0b9434..fae58fd329d 100644
--- a/ChangeLog-97b
+++ b/ChangeLog-97b
@@ -1,3 +1,10 @@
+Thu Sep 11 15:22:51 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * ace/Svc_Conf.y: Removed the warning about Service name being
+ different from Module name. I'm not sure why this was
+ complaining in the first place. Thanks to Eric Newton for
+ pointing this out.
+
Thu Sep 11 10:59:12 1997 <nw1@CHA-CHA>
* ace/Connector.cpp (handle_output): Increased the idle time
diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y
index 3d46c36a020..a5da4ab7804 100644
--- a/ace/Svc_Conf.y
+++ b/ace/Svc_Conf.y
@@ -140,11 +140,6 @@ module
ACE_ARGV args ($<static_node_>1->parameters ());
ACE_Module_Type *mt = get_module ($<static_node_>-1, $<static_node_>1);
- if (::strcmp ($<static_node_>1->name (),
- ((MT_Module *) mt->object ())->name ()) != 0)
- ACE_ERROR ((LM_ERROR, "warning, service name %s is different from Module name %s\n",
- $<static_node_>1->name (), ((MT_Module *) mt->object ())->name ()));
-
if (mt->init (args.argc (), args.argv ()) == -1
|| ((ACE_Stream_Type *) ($<static_node_>-1)->record ()->type ())->push (mt) == -1)
{
@@ -156,10 +151,7 @@ module
| static
{
ACE_Module_Type *mt = get_module ($<static_node_>-1, $<static_node_>1->name ());
- if (::strcmp ($<static_node_>1->name (),
- ((MT_Module *) mt->object ())->name ()) != 0)
- ACE_ERROR ((LM_ERROR, "warning, service name %s is different from Module name %s\n",
- $<static_node_>1->name (), ((MT_Module *) mt->object ())->name ()));
+
if (((ACE_Stream_Type *) ($<static_node_>-1)->record ()->type ())->push (mt) == -1)
yyerrno++;
}