diff options
author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-02-08 10:37:34 +0000 |
---|---|---|
committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-02-08 10:37:34 +0000 |
commit | 808646bb3aebf2c84c860ec8b7db3a0ebe58b84b (patch) | |
tree | dc49937658b90c7f38f56a4e7901cf80dbc21401 | |
parent | 4b713d71c62e9ff1f8ab5d52c78abec8fab09a8e (diff) | |
download | ATCD-808646bb3aebf2c84c860ec8b7db3a0ebe58b84b.tar.gz |
Mon Feb 8 10:35:30 UTC 2010 Martin Corino <mcorino@remedy.nl>
* orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
* orbsvcs/tests/Concurrency/lex.CC_command.cpp:
* performance-tests/POA/Demux/demux_test_server.cpp:
* tests/Exposed_Policies/RT_Properties.cpp:
Fixed new GCC 4.4.x warning about ignoring return values of
function marked by the new warn_unused_result attribute.
-rw-r--r-- | TAO/ChangeLog | 10 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp | 2 | ||||
-rw-r--r-- | TAO/performance-tests/POA/Demux/demux_test_server.cpp | 4 | ||||
-rw-r--r-- | TAO/tests/Exposed_Policies/RT_Properties.cpp | 9 |
5 files changed, 19 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a425984dfda..1df6d87ca97 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Mon Feb 8 10:35:30 UTC 2010 Martin Corino <mcorino@remedy.nl> + + * orbsvcs/orbsvcs/Trader/Constraint_l.cpp: + * orbsvcs/tests/Concurrency/lex.CC_command.cpp: + * performance-tests/POA/Demux/demux_test_server.cpp: + * tests/Exposed_Policies/RT_Properties.cpp: + + Fixed new GCC 4.4.x warning about ignoring return values of + function marked by the new warn_unused_result attribute. + Mon Feb 8 06:58:43 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * TAO_IDL/fe/lex.yy.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index 73c4980cb04..28a91e0e0e1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -530,7 +530,7 @@ YY_MALLOC_DECL /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define TAO_TRADER_ECHO (void) fwrite( yytext, yyleng, 1, yyout ) +#define TAO_TRADER_ECHO { size_t __dum_ret = fwrite( yytext, yyleng, 1, yyout ); (void) __dum_ret; } #endif //FUZZ: enable check_for_lack_ACE_OS diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp index e50f7fa9654..b70ca157c86 100644 --- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp @@ -546,7 +546,7 @@ ACE_CC_YY_MALLOC_DECL /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ACE_CC_ECHO (void) fwrite( ace_cc_yytext, ace_cc_yyleng, 1, ace_cc_yyout ) +#define ACE_CC_ECHO { size_t __dum_ret = fwrite( ace_cc_yytext, ace_cc_yyleng, 1, ace_cc_yyout ); (void) __dum_ret; } #endif //FUZZ: enable check_for_lack_ACE_OS diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp index 986c3735279..4fbf97860a0 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp @@ -199,7 +199,7 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv []) char poa_name [128]; ACE_OS::memset (poa_name, 0, 128); - (void) fscanf (this->poa_fp_, "%s", poa_name); + int n_matched = fscanf (this->poa_fp_, "%s", poa_name); try { @@ -270,7 +270,7 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv []) ACE_OS::memset (servant_name, 0, 128); - (void) fscanf (this->servant_fp_, "%s", servant_name); + n_matched = fscanf (this->servant_fp_, "%s", servant_name); ACE_DEBUG ((LM_DEBUG, "Activating Servant with Name : %s\n", diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp index 904871942f6..e50ee9913a3 100644 --- a/TAO/tests/Exposed_Policies/RT_Properties.cpp +++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp @@ -36,26 +36,27 @@ RT_Properties::read_from (const ACE_TCHAR *file_name) char string_field[256]; int int_field; unsigned int i = 0; + int n_matched; while (fscanf (fp, "%s", string_field) != EOF ) { if (ACE_OS::strcmp (string_field, "Priority") == 0) { - fscanf (fp, "%d", &int_field); + n_matched = fscanf (fp, "%d", &int_field); rt_properties->priority (int_field); } else if (ACE_OS::strcmp (string_field, "Priority_Bands") == 0) { - fscanf (fp, "%d", &int_field); + n_matched = fscanf (fp, "%d", &int_field); rt_properties->priority_bands_.length (int_field); } else if (ACE_OS::strcmp (string_field, "Priority_Range") == 0) { - fscanf (fp, "%d", &int_field); + n_matched = fscanf (fp, "%d", &int_field); rt_properties->priority_bands_[i].low = int_field; - fscanf (fp, "%d", &int_field); + n_matched = fscanf (fp, "%d", &int_field); rt_properties->priority_bands_[i].high = int_field; ++i; |