From: DJ Delorie <dj@delorie.com>
Date: Mon, 5 Mar 2001 19:42:04 +0000 (+0000)
Subject: merge from gcc
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c39ef5090839ec0aed6a9b8541daa8054d60d25d;p=pf3gnuchains%2Fpf3gnuchains3x.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 3f7c77faac..f8988392db 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 1d2a475660..6133e6e1d4 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)
 		{