From 5810f3948f2190536ac328f5820f750ec855565b Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 5 Mar 2001 19:42:04 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 4 ++++ libiberty/cplus-dem.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 3f7c77faac3..f8988392db2 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2001-03-04 John David Anglin + + * cplus-dem.c (main): Cast enum style to int. + 2001-02-16 Loren J. Rittle * cplus-dem.c (main): Initialize style. diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c index 1d2a4756606..6133e6e1d40 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) { -- 2.30.2