aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/firrtl/passes/memlib
diff options
context:
space:
mode:
authorJim Lawson2017-05-27 20:34:39 -0700
committerJack Koenig2017-05-27 20:34:39 -0700
commit8c9c9e2c341c87607d44026b8fc5457409c707b3 (patch)
tree9fa71fca8dc75524b2565f06c07386894f2583b5 /src/main/scala/firrtl/passes/memlib
parent99db604e59e8f052d7628f104eecb2641c6ab9b2 (diff)
Prep for Scala 2.12 (#557)
* Update dependencies and JavaConverters for Scala 2.12 * Bump Scala (and library) version(s). * replace "error" with "Utils.error"; bump Scala version to 2.11.11
Diffstat (limited to 'src/main/scala/firrtl/passes/memlib')
-rw-r--r--src/main/scala/firrtl/passes/memlib/YamlUtils.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/scala/firrtl/passes/memlib/YamlUtils.scala b/src/main/scala/firrtl/passes/memlib/YamlUtils.scala
index 75a62245..4cc28e42 100644
--- a/src/main/scala/firrtl/passes/memlib/YamlUtils.scala
+++ b/src/main/scala/firrtl/passes/memlib/YamlUtils.scala
@@ -3,7 +3,9 @@
package firrtl.passes
package memlib
import net.jcazevedo.moultingyaml._
-import java.io.{File, CharArrayWriter, PrintWriter}
+import java.io.{CharArrayWriter, File, PrintWriter}
+
+import firrtl.Utils.error
object CustomYAMLProtocol extends DefaultYamlProtocol {
// bottom depends on top