diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-12-22 11:57:02 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-12-22 11:57:02 +0100 |
| commit | b4eb8c5c5ee866fc6d7f824f01d35f1f979f75b9 (patch) | |
| tree | 334e7043043b6dbcecffe9cb22eb1aa2dae6f48a | |
| parent | ce9b2f4eb4e75c483bdb914b45f08507a2c3b97d (diff) | |
| download | gperf-b4eb8c5c5ee866fc6d7f824f01d35f1f979f75b9.tar.gz | |
Avoid g++ warnings.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/options.cc | 4 | ||||
| -rw-r--r-- | src/output.cc | 4 |
3 files changed, 10 insertions, 4 deletions
@@ -1,5 +1,11 @@ 2009-12-22 Bruno Haible <bruno@clisp.org> + Avoid g++ warnings. + * src/options.cc (Options::print_options): Add parentheses. + * src/output.cc (Output::output_lookup_array): Cast fprintf argument. + +2009-12-22 Bruno Haible <bruno@clisp.org> + Support CPPFLAGS as mandated by GNU standards. * lib/Makefile.in (CPPFLAGS): Use autoconf determined value. * src/Makefile.in (CPPFLAGS): Likewise. diff --git a/src/options.cc b/src/options.cc index c69d922..3da2b0e 100644 --- a/src/options.cc +++ b/src/options.cc @@ -279,7 +279,7 @@ Options::print_options () const { putchar (*arg); arg++; - if (*arg >= 'A' && *arg <= 'Z' || *arg >= 'a' && *arg <= 'z') + if ((*arg >= 'A' && *arg <= 'Z') || (*arg >= 'a' && *arg <= 'z')) { putchar (*arg); arg++; @@ -291,7 +291,7 @@ Options::print_options () const putchar (*arg); arg++; } - while (*arg >= 'A' && *arg <= 'Z' || *arg >= 'a' && *arg <= 'z' || *arg == '-'); + while ((*arg >= 'A' && *arg <= 'Z') || (*arg >= 'a' && *arg <= 'z') || *arg == '-'); if (*arg == '=') { putchar (*arg); diff --git a/src/output.cc b/src/output.cc index 2afabe3..4b0e4c6 100644 --- a/src/output.cc +++ b/src/output.cc @@ -1299,8 +1299,8 @@ Output::output_lookup_array () const if (option[DEBUG]) fprintf (stderr, - "dup_ptr[%d]: hash_value = %d, index = %d, count = %d\n", - dup_ptr - duplicates, + "dup_ptr[%lu]: hash_value = %d, index = %d, count = %d\n", + static_cast<unsigned long>(dup_ptr - duplicates), dup_ptr->hash_value, dup_ptr->index, dup_ptr->count); int i; |