merge from gcc

2001-03-05 19:42:04 +00:00 · 2001-03-05 19:42:04 +00:00 · 5810f3948f
commit 5810f3948f
parent 61e2d1f302
2 changed files with 5 additions and 1 deletions
--- 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.
--- 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)
 		{