summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-08-17 16:09:57 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-08-17 16:09:57 +0000
commit499f2cfbd1e05441f7e446e05efbaae2b6593543 (patch)
tree934f93c729417176a81da4061178f028c202eb29
parentf55545ab9c114e7d3b72df75fb6ec735f76da8bb (diff)
downloadATCD-499f2cfbd1e05441f7e446e05efbaae2b6593543.tar.gz
ChangeLogTag:Mon Aug 17 11:07:09 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-98c8
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff18
3 files changed, 24 insertions, 4 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index d8d0c70da7f..d0f5d206ca6 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,6 +1,12 @@
+Mon Aug 17 11:07:09 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
+
+ * orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff:
+ * orbsvcs/tests/Concurrency/CC_command.tab.cpp:
+ Removed unused label. Thanks to David for pointing this out.
+
Mon Aug 17 10:45:09 1998 David L. Levine <levine@cs.wustl.edu>
- * /orbsvcs/tests/Trading/Makefile: removed shared_libs_only=1,
+ * orbsvcs/tests/Trading/Makefile: removed shared_libs_only=1,
because that's taken care of in the platform_macros.GNU file.
This module now builds on VxWorks.
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
index 74166a18d15..63df1f96012 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
@@ -422,7 +422,7 @@ ace_cc_yyloop:
#ifdef lint
goto ace_cc_yyerrlab;
#endif
-ace_cc_yyerrlab:
+
++ace_cc_yynerrs;
ace_cc_yyinrecovery:
if (ace_cc_yyerrflag < 3)
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff
index b65d5ac3957..1106e37cff4 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff
@@ -1,6 +1,11 @@
--- CC_command.tab.cpp.orig Thu Jul 30 13:30:26 1998
-+++ CC_command.tab.cpp Thu Jul 30 13:30:37 1998
-@@ -367,7 +367,7 @@
++++ CC_command.tab.cpp Mon Aug 17 11:06:24 1998
+@@ -1,3 +1,4 @@
++// $Id$
+ #ifndef lint
+ char ace_cc_yysccsid[] = "@(#)yaccpar 1.4 (Berkeley) 02/25/90 \n\
+ Modified 5/2/90 by J. Roskind to support graphic debugging modes";
+@@ -367,7 +368,7 @@
*ace_cc_yyssp = ace_cc_yystate = 0;
ace_cc_yyloop:
@@ -9,3 +14,12 @@
if (ace_cc_yychar < 0)
{
if ((ace_cc_yychar = ace_cc_yylex()) < 0) ace_cc_yychar = 0;
+@@ -421,7 +422,7 @@
+ #ifdef lint
+ goto ace_cc_yyerrlab;
+ #endif
+-ace_cc_yyerrlab:
++
+ ++ace_cc_yynerrs;
+ ace_cc_yyinrecovery:
+ if (ace_cc_yyerrflag < 3)