diff options
Diffstat (limited to 'TAO/TAO_IDL/fe')
| -rw-r--r-- | TAO/TAO_IDL/fe/Makefile | 10 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.ll | 5 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.yy | 14 |
3 files changed, 23 insertions, 6 deletions
diff --git a/TAO/TAO_IDL/fe/Makefile b/TAO/TAO_IDL/fe/Makefile index a9a46875470..7672da17b17 100644 --- a/TAO/TAO_IDL/fe/Makefile +++ b/TAO/TAO_IDL/fe/Makefile @@ -53,11 +53,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # Local targets (and local hacks) #---------------------------------------------------------------------------- -CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION) -YACC = yacc -LEX = lex -YFLAGS = -t -d -LFLAGS = -t +CPPFLAGS += -D_REENTRANT -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION) +YACC = bison +LEX = flex +YFLAGS = -t -d -y +LFLAGS = -t # Create the parser and lexer y.tab.hh y.tab.cpp: idl.yy diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index b7ff90b6a6d..7128d976e4f 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -212,7 +212,7 @@ oneway return ONEWAY; if (next == '/') break; else - yyunput(c); + yyunput(c, NULL); if (c == '\n') idl_global->set_lineno(idl_global->lineno() + 1); } @@ -376,6 +376,9 @@ idl_atof(char *s) double e, k; long neg = 0, negexp = 0; + ACE_UNUSED_ARG (f); + ACE_UNUSED_ARG (h); + if (*s == '-') { neg = 1; s++; diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy index 7bca726fdf0..b7a07242721 100644 --- a/TAO/TAO_IDL/fe/idl.yy +++ b/TAO/TAO_IDL/fe/idl.yy @@ -335,6 +335,8 @@ interface : AST_Decl *d = NULL; AST_Interface *fd = NULL; + ACE_UNUSED_ARG (v); + /* * Make a new interface node and add it to its enclosing scope */ @@ -637,6 +639,8 @@ const_dcl : UTL_StrList *p = idl_global->pragmas(); AST_Decl *v = NULL; + ACE_UNUSED_ARG (v); + idl_global->set_parse_state(IDL_GlobalData::PS_ConstExprSeen); /* * Create a node representing a constant declaration. Store @@ -873,6 +877,8 @@ type_declarator : AST_Decl *v = NULL; UTL_StrList *p = idl_global->pragmas(); + ACE_UNUSED_ARG (v); + idl_global->set_parse_state(IDL_GlobalData::PS_DeclaratorsSeen); /* * Create a list of type renamings. Add them to the @@ -1117,6 +1123,8 @@ struct_type : UTL_StrList *p = idl_global->pragmas(); AST_Decl *v = NULL; + ACE_UNUSED_ARG (v); + idl_global->set_parse_state(IDL_GlobalData::PS_StructIDSeen); /* * Create a node representing a struct declaration. Add it @@ -1245,6 +1253,8 @@ union_type : AST_Decl *v = NULL; UTL_StrList *p = idl_global->pragmas(); + ACE_UNUSED_ARG (v); + idl_global->set_parse_state(IDL_GlobalData::PS_SwitchCloseParSeen); /* * Create a node representing a union. Add it to its enclosing @@ -1520,6 +1530,8 @@ enum_type : AST_Decl *v = NULL; UTL_StrList *p = idl_global->pragmas(); + ACE_UNUSED_ARG (v); + idl_global->set_parse_state(IDL_GlobalData::PS_EnumIDSeen); /* * Create a node representing an enum and add it to its @@ -1925,6 +1937,8 @@ exception : UTL_StrList *p = idl_global->pragmas(); AST_Decl *v = NULL; + ACE_UNUSED_ARG (v); + idl_global->set_parse_state(IDL_GlobalData::PS_ExceptIDSeen); /* * Create a node representing an exception and add it to |