diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-19 21:07:31 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-19 21:07:31 +0000 |
| commit | c8d1906bdac013e311d81580f9a79788b874c407 (patch) | |
| tree | a205f1359be840d1e85c119268d10de3611b74aa | |
| parent | e637d09e7df9335fb67136e879d51a2596261c79 (diff) | |
| download | ATCD-c8d1906bdac013e311d81580f9a79788b874c407.tar.gz | |
(ace_cc_yyinput): don't compile this function in if ACE_CC_YY_NO_INPUT is defined, to avoid compile warning about unused static function
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff | 35 |
2 files changed, 34 insertions, 6 deletions
diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp index a46de471d00..ccbf30b8145 100644 --- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp @@ -1,7 +1,7 @@ /* A lexical scanner generated by flex */ // $Id$ /* Scanner skeleton version: - * $Header$ + * Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp */ #define FLEX_SCANNER @@ -1216,7 +1216,7 @@ register char *ace_cc_yy_bp; } #endif /* ifndef ACE_CC_YY_NO_UNPUT */ - +#ifndef ACE_CC_YY_NO_INPUT #ifdef __cplusplus static int ace_cc_yyinput() #else @@ -1289,6 +1289,7 @@ static int input() return c; } +#endif /* ! ACE_CC_YY_NO_INPUT */ #ifdef ACE_CC_YY_USE_PROTOS diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff index c410450d8a0..5144d9a7310 100644 --- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff +++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff @@ -1,6 +1,16 @@ ---- lex.CC_command.cpp.orig Wed Jun 17 13:53:27 1998 -+++ lex.CC_command.cpp Wed Jun 17 15:09:59 1998 -@@ -706,110 +706,110 @@ +--- lex.CC_command.cpp.orig Fri Jun 19 16:04:06 1998 ++++ lex.CC_command.cpp Fri Jun 19 16:04:24 1998 +@@ -1,7 +1,7 @@ + /* A lexical scanner generated by flex */ +- ++// $Id$ + /* Scanner skeleton version: +- * $Header$ ++ * Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp + */ + + #define FLEX_SCANNER +@@ -709,110 +709,110 @@ ACE_CC_YY_RULE_SETUP #line 30 "CC_command.l" return T_TERM; @@ -132,7 +142,16 @@ case 22: ACE_CC_YY_RULE_SETUP #line 54 "CC_command.l" -@@ -1262,13 +1262,13 @@ +@@ -1216,7 +1216,7 @@ + } + #endif /* ifndef ACE_CC_YY_NO_UNPUT */ + +- ++#ifndef ACE_CC_YY_NO_INPUT + #ifdef __cplusplus + static int ace_cc_yyinput() + #else +@@ -1265,13 +1265,13 @@ if ( ace_cc_yywrap() ) return EOF; @@ -148,3 +167,11 @@ } case EOB_ACT_CONTINUE_SCAN: +@@ -1289,6 +1289,7 @@ + + return c; + } ++#endif /* ! ACE_CC_YY_NO_INPUT */ + + + #ifdef ACE_CC_YY_USE_PROTOS |