From 1f2383fb61ca7c4e4def0c7c4ee1a19e58c36288 Mon Sep 17 00:00:00 2001
From: Andrew Waterman
Date: Wed, 5 Aug 2015 01:28:58 -0700
Subject: Use Width object, not Int

Please, no more -1
---
 src/main/scala/Chisel/utils.scala | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/main/scala/Chisel/utils.scala')

diff --git a/src/main/scala/Chisel/utils.scala b/src/main/scala/Chisel/utils.scala
index fe8329a7..5756fee0 100644
--- a/src/main/scala/Chisel/utils.scala
+++ b/src/main/scala/Chisel/utils.scala
@@ -94,9 +94,7 @@ object Mux1H
     if (in.tail.isEmpty) in.head._2
     else {
       val masked = in map {case (s, i) => Mux(s, i.toBits, Bits(0))}
-      val width =
-        if (in.forall(_._2.knownWidth)) Some(in.map(_._2.getWidth).max)
-        else None
+      val width = in.map(_._2.width).reduce(_ max _)
       in.head._2.cloneTypeWidth(width).fromBits(masked.reduceLeft(_|_))
     }
   }
-- 
cgit v1.2.3