diff options
author | Pedro Alves <palves@redhat.com> | 2015-11-19 14:32:53 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2015-11-19 14:32:53 +0000 |
commit | 915ef8b18e28e6418216a582067b9fbdd6395e6a (patch) | |
tree | 3c9c9222e41286506847f951a33f6063aaeb5672 /gdb/remote.c | |
parent | c2825638b6784179f191c6ee8ebbda1c49ae5271 (diff) | |
download | gdb-915ef8b18e28e6418216a582067b9fbdd6395e6a.zip gdb-915ef8b18e28e6418216a582067b9fbdd6395e6a.tar.gz gdb-915ef8b18e28e6418216a582067b9fbdd6395e6a.tar.bz2 |
[C++] remote.c: Avoid enum arithmetic
Fixes:
src/gdb/remote.c: In function ‘void remote_unpush_target()’:
src/gdb/remote.c:4610:45: error: invalid conversion from ‘int’ to ‘strata’ [-fpermissive]
pop_all_targets_above (process_stratum - 1);
^
In file included from src/gdb/inferior.h:38:0,
from src/gdb/remote.c:25:
src/gdb/target.h:2299:13: error: initializing argument 1 of ‘void pop_all_targets_above(strata)’ [-fpermissive]
extern void pop_all_targets_above (enum strata above_stratum);
^
I used to carry a patch in the C++ branch that just did:
- pop_all_targets_above (process_stratum - 1);
+ pop_all_targets_above ((enum strata) (process_stratum - 1));
But then thought that maybe adding a routine that does exactly what we
need results in clearer code. This is the result.
gdb/ChangeLog:
2015-11-19 Pedro Alves <palves@redhat.com>
* remote.c (remote_unpush_target): Use
pop_all_targets_at_and_above instead of pop_all_targets_above.
* target.c (unpush_target_and_assert): New function, factored out
from ...
(pop_all_targets_above): ... here.
(pop_all_targets_at_and_above): New function.
* target.h (pop_all_targets_at_and_above): Declare.
Diffstat (limited to 'gdb/remote.c')
-rw-r--r-- | gdb/remote.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gdb/remote.c b/gdb/remote.c index fed397af..6c86ab2 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -4607,7 +4607,7 @@ remote_query_supported (void) static void remote_unpush_target (void) { - pop_all_targets_above (process_stratum - 1); + pop_all_targets_at_and_above (process_stratum); } static void |