diff options
| author | Chick Markley | 2019-12-17 14:49:20 -0800 |
|---|---|---|
| committer | GitHub | 2019-12-17 14:49:20 -0800 |
| commit | 9417b3a4f743446f978cc8268660878f4af87534 (patch) | |
| tree | 9ab760060a01227a74d54caaf61d842ba84d50c8 | |
| parent | 6043ede715a44992975e60990fd2924b1ea6896a (diff) | |
| parent | 98a6710cc0447d79cbd12271ea450c70e619b6f8 (diff) | |
Merge branch 'master' into interval-fix-2
| -rw-r--r-- | chiselFrontend/src/main/scala/chisel3/Aggregate.scala | 2 | ||||
| -rw-r--r-- | src/main/scala/chisel3/stage/package.scala | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/chiselFrontend/src/main/scala/chisel3/Aggregate.scala b/chiselFrontend/src/main/scala/chisel3/Aggregate.scala index 42b40ed9..8141fdba 100644 --- a/chiselFrontend/src/main/scala/chisel3/Aggregate.scala +++ b/chiselFrontend/src/main/scala/chisel3/Aggregate.scala @@ -43,7 +43,7 @@ sealed abstract class Aggregate extends Data { } } - override def litOption: Option[BigInt] = ??? // TODO implement me + override def litOption: Option[BigInt] = None // TODO implement me /** Returns a Seq of the immediate contents of this Aggregate, in order. */ diff --git a/src/main/scala/chisel3/stage/package.scala b/src/main/scala/chisel3/stage/package.scala index 67d38ae7..57766be6 100644 --- a/src/main/scala/chisel3/stage/package.scala +++ b/src/main/scala/chisel3/stage/package.scala @@ -28,7 +28,6 @@ package object stage { private[chisel3] implicit object ChiselExecutionResultView extends OptionsView[ChiselExecutionResult] { - lazy val dummyWriteEmitted = new firrtl.stage.phases.WriteEmitted lazy val dummyConvert = new Convert lazy val dummyEmitter = new Emitter |