diff options
| author | Jim Lawson | 2017-11-06 09:34:41 -0800 |
|---|---|---|
| committer | GitHub | 2017-11-06 09:34:41 -0800 |
| commit | 734c52038f4f2bf1fb379ee2c8438cd98fb7506d (patch) | |
| tree | 4d380386162f64e55ec41a64f71c0b51c8f23ccb | |
| parent | 7e6e7efb649a1dec5d708e4a9d191dd759c12380 (diff) | |
Default to unidoc for scaladoc generation. (#715)
Disambiguate DontCare reference in initializeSingletons() avoiding compilation error during unidoc generation.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | chiselFrontend/src/main/scala/chisel3/internal/Builder.scala | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -57,7 +57,7 @@ ifneq (,$(RM_DIRS)) endif scaladoc: - $(SBT) $(SBT_FLAGS) doc + $(SBT) $(SBT_FLAGS) unidoc site: $(SBT) $(SBT_FLAGS) make-site diff --git a/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala b/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala index 90eabba3..0b279347 100644 --- a/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala +++ b/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala @@ -166,7 +166,7 @@ private[chisel3] object Builder { // Initialize any singleton objects before user code inadvertently inherits them. private def initializeSingletons(): Unit = { - val dummy = DontCare + val dummy = core.DontCare } def idGen: IdGen = dynamicContext.idGen def globalNamespace: Namespace = dynamicContext.globalNamespace |