diff options
| author | Christian Biesinger <cbiesinger@google.com> | 2019-12-18 17:50:33 -0600 |
|---|---|---|
| committer | Christian Biesinger <cbiesinger@google.com> | 2019-12-19 13:11:29 -0600 |
| commit | 1cd4a20a27c430fdd0db8d5b154e9c7860e440f5 (patch) | |
| tree | dc8cb1f8edef2e647ec59aa96deae03532b34747 | |
| parent | aa989b27d0bad451455416953c0e5026e229863a (diff) | |
| download | fsf-binutils-gdb-1cd4a20a27c430fdd0db8d5b154e9c7860e440f5.zip fsf-binutils-gdb-1cd4a20a27c430fdd0db8d5b154e9c7860e440f5.tar.gz fsf-binutils-gdb-1cd4a20a27c430fdd0db8d5b154e9c7860e440f5.tar.bz2 | |
Cast the log10 argument to double to disambiguate it
On Solaris 11 with gcc 5.5.0 (gcc211 on the compile farm), math.h has a
using std::log10; directive. This is unfortunate because std::log10 has
overloads for float/double/long double. To disambiguate this call,
cast the argument to double to fix the build.
gdb/ChangeLog:
2019-12-19 Christian Biesinger <cbiesinger@google.com>
* tui/tui-source.c (tui_source_window::set_contents): Cast argument of
log10 to double to fix Solaris 11 with gcc 5.5.
Change-Id: I6c0c52e9c172b529c899a435d430e5916aeef69f
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/tui/tui-source.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e0da79e..8595b6e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2019-12-19 Christian Biesinger <cbiesinger@google.com> + * tui/tui-source.c (tui_source_window::set_contents): Cast argument of + log10 to double to fix Solaris 11 with gcc 5.5. + +2019-12-19 Christian Biesinger <cbiesinger@google.com> + * fbsd-tdep.c (fbsd_info_proc_files_entry): Rename local var "sun" to "saddr_un". diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index 32877d7..6c3425f 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -85,7 +85,9 @@ tui_source_window::set_contents (struct gdbarch *arch, int digits = 0; if (compact_source) { - double l = log10 (offsets->size ()); + /* Solaris 11+gcc 5.5 has ambiguous overloads of log10, so we + cast to double to get the right one. */ + double l = log10 ((double) offsets->size ()); digits = 1 + (int) l; } |