diff options
| author | DJ Delorie <dj@redhat.com> | 2001-03-05 19:42:04 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2001-03-05 19:42:04 +0000 |
| commit | 5810f3948f2190536ac328f5820f750ec855565b (patch) | |
| tree | 65909e4e029b028349f6affb01981f9636a102c8 | |
| parent | 61e2d1f302408f76abc34136623a421f33de2580 (diff) | |
| download | gdb-5810f3948f2190536ac328f5820f750ec855565b.zip gdb-5810f3948f2190536ac328f5820f750ec855565b.tar.gz gdb-5810f3948f2190536ac328f5820f750ec855565b.tar.bz2 | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 4 | ||||
| -rw-r--r-- | libiberty/cplus-dem.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 3f7c77f..f898839 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2001-03-04 John David Anglin <dave@hiauly1.hia.nrc.ca> + + * cplus-dem.c (main): Cast enum style to int. + 2001-02-16 Loren J. Rittle <ljrittle@acm.org> * cplus-dem.c (main): Initialize style. diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c index 1d2a475..6133e6e 100644 --- a/libiberty/cplus-dem.c +++ b/libiberty/cplus-dem.c @@ -5148,7 +5148,7 @@ main (argc, argv) skip_first = i; mbuffer[i] = 0; - flags |= style; + flags |= (int) style; result = cplus_demangle (mbuffer + skip_first, flags); if (result) { |