diff options
author | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-06 02:07:51 +0000 |
---|---|---|
committer | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-06 02:07:51 +0000 |
commit | e65a30b50ba9bf034a22656d9cb15cad948001b7 (patch) | |
tree | b110096bd0e37411ca2e688a50d7bb6bf4269ff5 | |
parent | 67a6ea0f331a81d7f094b2cf512a0ae2046306fd (diff) | |
download | ATCD-e65a30b50ba9bf034a22656d9cb15cad948001b7.tar.gz |
ChangeLogTag: Sun Apr 6 01:53:13 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
-rw-r--r-- | ACE/ChangeLog | 17 | ||||
-rw-r--r-- | ACE/ace/Service_Gestalt.cpp | 6 | ||||
-rw-r--r-- | ACE/ace/Svc_Conf_y.cpp | 162 | ||||
-rw-r--r-- | ACE/ace/svcconf.mpb | 2 | ||||
-rw-r--r-- | ACE/tests/run_test.lst | 2 |
5 files changed, 101 insertions, 88 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 26b97f4c899..cf4654f6419 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,19 @@ +Sun Apr 6 01:53:13 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Service_Gestalt.cpp: + + Fixing unused variable warning. + + * ace/Svc_Conf_y.cpp: + * ace/svcconf.mpb: + + Ensuring there are no TAB characters present in the generated + file. + + * tests/run_test.lst: + + Excluding Bug_2980_Regression as it is not runnable on vxWorks. + Sat Apr 5 16:21:50 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com> * ace/Service_Config.inl: @@ -14,7 +30,6 @@ Sat Apr 5 16:21:50 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com> Reformatting and cleanup. - Sat Apr 5 13:42:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Bug_2980_Regression_Test.cpp: diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index 6dec7c556fa..d1e1d72ebf4 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -199,9 +199,8 @@ ACE_Service_Gestalt::intrusive_add_ref (ACE_Service_Gestalt* g) { if (g != 0) { - long tmp = ++g->refcnt_; - // printf ("// (%x) ++refcnt=%ld\n", (unsigned int)ACE_OS::thr_self (), tmp); - ACE_ASSERT (tmp > 0); + ++g->refcnt_; + ACE_ASSERT (g->refcnt_ > 0); } } @@ -211,7 +210,6 @@ ACE_Service_Gestalt::intrusive_remove_ref (ACE_Service_Gestalt* g) if (g != 0) { long tmp = --g->refcnt_; - // printf ("// (%x) refcnt--=%ld\n", (unsigned int)ACE_OS::thr_self (), tmp); if (tmp <= 0) delete g; ACE_ASSERT (tmp >= 0); } diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp index 1adc4c2b969..773902e927b 100644 --- a/ACE/ace/Svc_Conf_y.cpp +++ b/ACE/ace/Svc_Conf_y.cpp @@ -358,13 +358,13 @@ union ace_yyalloc # define ACE_YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else -# define ACE_YYCOPY(To, From, Count) \ - do \ - { \ - ACE_YYSIZE_T ace_yyi; \ - for (ace_yyi = 0; ace_yyi < (Count); ace_yyi++) \ - (To)[ace_yyi] = (From)[ace_yyi]; \ - } \ +# define ACE_YYCOPY(To, From, Count) \ + do \ + { \ + ACE_YYSIZE_T ace_yyi; \ + for (ace_yyi = 0; ace_yyi < (Count); ace_yyi++) \ + (To)[ace_yyi] = (From)[ace_yyi]; \ + } \ while (ACE_YYID (0)) # endif # endif @@ -374,15 +374,15 @@ union ace_yyalloc elements in the stack, and ACE_YYPTR gives the new location of the stack. Advance ACE_YYPTR to a properly aligned location for the next stack. */ -# define ACE_YYSTACK_RELOCATE(Stack) \ - do \ - { \ - ACE_YYSIZE_T ace_yynewbytes; \ - ACE_YYCOPY (&ace_yyptr->Stack, Stack, ace_yysize); \ - Stack = &ace_yyptr->Stack; \ +# define ACE_YYSTACK_RELOCATE(Stack) \ + do \ + { \ + ACE_YYSIZE_T ace_yynewbytes; \ + ACE_YYCOPY (&ace_yyptr->Stack, Stack, ace_yysize); \ + Stack = &ace_yyptr->Stack; \ ace_yynewbytes = ace_yystacksize * sizeof (*Stack) + ACE_YYSTACK_GAP_MAXIMUM; \ - ace_yyptr += ace_yynewbytes / sizeof (*ace_yyptr); \ - } \ + ace_yyptr += ace_yynewbytes / sizeof (*ace_yyptr); \ + } \ while (ACE_YYID (0)) #endif @@ -405,7 +405,7 @@ union ace_yyalloc #define ACE_YYUNDEFTOK 2 #define ACE_YYMAXUTOK 271 -#define ACE_YYTRANSLATE(ACE_YYX) \ +#define ACE_YYTRANSLATE(ACE_YYX) \ ((unsigned int) (ACE_YYX) <= ACE_YYMAXUTOK ? ace_yytranslate[ACE_YYX] : ACE_YYUNDEFTOK) /* ACE_YYTRANSLATE[ACE_YYLEX] -- Bison symbol number corresponding to ACE_YYLEX. */ @@ -613,44 +613,44 @@ static const ace_yytype_uint8 ace_yystos[] = 29, 30, 37, 21, 20, 21 }; -#define ace_yyerrok (ace_yyerrstatus = 0) -#define ace_yyclearin (ace_yychar = ACE_YYEMPTY) -#define ACE_YYEMPTY (-2) -#define ACE_YYEOF 0 +#define ace_yyerrok (ace_yyerrstatus = 0) +#define ace_yyclearin (ace_yychar = ACE_YYEMPTY) +#define ACE_YYEMPTY (-2) +#define ACE_YYEOF 0 -#define ACE_YYACCEPT goto ace_yyacceptlab -#define ACE_YYABORT goto ace_yyabortlab -#define ACE_YYERROR goto ace_yyerrorlab +#define ACE_YYACCEPT goto ace_yyacceptlab +#define ACE_YYABORT goto ace_yyabortlab +#define ACE_YYERROR goto ace_yyerrorlab /* Like ACE_YYERROR except do call ace_yyerror. This remains here temporarily to ease the transition to the new meaning of ACE_YYERROR, for GCC. Once GCC version 2 has supplanted version 1, this can go. */ -#define ACE_YYFAIL goto ace_yyerrlab +#define ACE_YYFAIL goto ace_yyerrlab #define ACE_YYRECOVERING() (!!ace_yyerrstatus) -#define ACE_YYBACKUP(Token, Value) \ -do \ - if (ace_yychar == ACE_YYEMPTY && ace_yylen == 1) \ - { \ - ace_yychar = (Token); \ - ace_yylval = (Value); \ - ace_yytoken = ACE_YYTRANSLATE (ace_yychar); \ - ACE_YYPOPSTACK (1); \ - goto ace_yybackup; \ - } \ - else \ - { \ +#define ACE_YYBACKUP(Token, Value) \ +do \ + if (ace_yychar == ACE_YYEMPTY && ace_yylen == 1) \ + { \ + ace_yychar = (Token); \ + ace_yylval = (Value); \ + ace_yytoken = ACE_YYTRANSLATE (ace_yychar); \ + ACE_YYPOPSTACK (1); \ + goto ace_yybackup; \ + } \ + else \ + { \ ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ACE_YY_("syntax error: cannot back up")); \ - ACE_YYERROR; \ - } \ + ACE_YYERROR; \ + } \ while (ACE_YYID (0)) -#define ACE_YYTERROR 1 -#define ACE_YYERRCODE 256 +#define ACE_YYTERROR 1 +#define ACE_YYERRCODE 256 /* ACE_YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. @@ -659,22 +659,22 @@ while (ACE_YYID (0)) #define ACE_YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef ACE_YYLLOC_DEFAULT -# define ACE_YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ +# define ACE_YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ if (ACE_YYID (N)) \ - { \ - (Current).first_line = ACE_YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = ACE_YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = ACE_YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = ACE_YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - ACE_YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - ACE_YYRHSLOC (Rhs, 0).last_column; \ - } \ + { \ + (Current).first_line = ACE_YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = ACE_YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = ACE_YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = ACE_YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + ACE_YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + ACE_YYRHSLOC (Rhs, 0).last_column; \ + } \ while (ACE_YYID (0)) #endif @@ -685,9 +685,9 @@ while (ACE_YYID (0)) #ifndef ACE_YY_LOCATION_PRINT # if ACE_YYLTYPE_IS_TRIVIAL -# define ACE_YY_LOCATION_PRINT(File, Loc) \ - ACE_OS::fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ +# define ACE_YY_LOCATION_PRINT(File, Loc) \ + ACE_OS::fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ (Loc).last_line, (Loc).last_column) # else # define ACE_YY_LOCATION_PRINT(File, Loc) ((void) 0) @@ -711,21 +711,21 @@ while (ACE_YYID (0)) # define ACE_YYFPRINTF ACE_OS::fprintf # endif -# define ACE_YYDPRINTF(Args) \ -do { \ - if (ace_yydebug) \ - ACE_YYFPRINTF Args; \ +# define ACE_YYDPRINTF(Args) \ +do { \ + if (ace_yydebug) \ + ACE_YYFPRINTF Args; \ } while (ACE_YYID (0)) -# define ACE_YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (ace_yydebug) \ - { \ - ACE_YYFPRINTF (stderr, "%s ", Title); \ - ace_yy_symbol_print (stderr, \ +# define ACE_YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (ace_yydebug) \ + { \ + ACE_YYFPRINTF (stderr, "%s ", Title); \ + ace_yy_symbol_print (stderr, \ Type, Value); \ - ACE_YYFPRINTF (stderr, "\n"); \ - } \ + ACE_YYFPRINTF (stderr, "\n"); \ + } \ } while (ACE_YYID (0)) @@ -809,10 +809,10 @@ ace_yy_stack_print (bottom, top) ACE_YYFPRINTF (stderr, "\n"); } -# define ACE_YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (ace_yydebug) \ - ace_yy_stack_print ((Bottom), (Top)); \ +# define ACE_YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (ace_yydebug) \ + ace_yy_stack_print ((Bottom), (Top)); \ } while (ACE_YYID (0)) @@ -842,14 +842,14 @@ ace_yy_reduce_print (ace_yyvsp, ace_yyrule) ACE_OS::fprintf (stderr, " $%d = ", ace_yyi + 1); ace_yy_symbol_print (stderr, ace_yyrhs[ace_yyprhs[ace_yyrule] + ace_yyi], &(ace_yyvsp[(ace_yyi + 1) - (ace_yynrhs)]) - ); + ); ACE_OS::fprintf (stderr, "\n"); } } -# define ACE_YY_REDUCE_PRINT(Rule) \ -do { \ - if (ace_yydebug) \ +# define ACE_YY_REDUCE_PRINT(Rule) \ +do { \ + if (ace_yydebug) \ ace_yy_reduce_print (ace_yyvsp, Rule); \ } while (ACE_YYID (0)) @@ -865,7 +865,7 @@ int ace_yydebug; /* ACE_YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef ACE_YYINITDEPTH +#ifndef ACE_YYINITDEPTH # define ACE_YYINITDEPTH 200 #endif @@ -1233,7 +1233,7 @@ int ace_yynerrs; ace_yystate = 0; ace_yyerrstatus = 0; ace_yynerrs = 0; - ace_yychar = ACE_YYEMPTY; /* Cause a token to be read. */ + ace_yychar = ACE_YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack @@ -1816,7 +1816,7 @@ ace_yyerrorlab: | ace_yyerrlab1 -- common code for both syntax error and ACE_YYERROR. | `-------------------------------------------------------------*/ ace_yyerrlab1: - ace_yyerrstatus = 3; /* Each real token shifted decrements this. */ + ace_yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { diff --git a/ACE/ace/svcconf.mpb b/ACE/ace/svcconf.mpb index 0ab77af76cd..ff79fb798dd 100644 --- a/ACE/ace/svcconf.mpb +++ b/ACE/ace/svcconf.mpb @@ -33,7 +33,7 @@ feature(ace_svcconf) { " sed -e 's/char \\*getenv/char *ace_foo/g' \\" // Eliminates getenv prototype, use ACE's " -e 's/= getenv/= ACE_OS::getenv/g' \\" // ... like this - qualified. " -e 's/fprintf/ACE_OS::fprintf/g' \\" // Use ACE's fprintf, not library's - " -e 's/\t/ /g' \\" // Eliminate tabs (replace with 2 spaces) + " -e 's/\\t/ /g' \\" // Eliminate tabs (replace with 2 spaces) " -e 's/yy/ace_yy/g' \\" " -e 's/->ace_yyerrno/->yyerrno/g' \\" // These reverse the unwanted ace_ prefix " -e 's/->ace_yylineno/->yylineno/g' \\" // added by the substitution, above. diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst index 5054e793c3b..6f84510a245 100644 --- a/ACE/tests/run_test.lst +++ b/ACE/tests/run_test.lst @@ -40,7 +40,7 @@ Bug_2659_Regression_Test: !ST !VxWorks64 !VxWorks65 Bug_2653_Regression_Test: !ST Bug_2815_Regression_Test Bug_2820_Regression_Test -Bug_2980_Regression_Test: !ST !STATIC !MSVC +Bug_2980_Regression_Test: !ST !STATIC !MSVC !VxWorks64 Bug_3102_Regression_Test CDR_Array_Test: !ACE_FOR_TAO CDR_File_Test: !ACE_FOR_TAO |