From f3ea8f1f7539d4afb50555df28dd16562c0ee256 Mon Sep 17 00:00:00 2001
From: Stephen Twigg
Date: Wed, 27 Apr 2016 17:19:44 -0700
Subject: clock|reset to _clock|_reset, added explanatory comment

@aswaterman closes #156
---
 src/main/scala/Chisel/util/Decoupled.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/scala/Chisel/util')

diff --git a/src/main/scala/Chisel/util/Decoupled.scala b/src/main/scala/Chisel/util/Decoupled.scala
index 6c7787f8..8e045855 100644
--- a/src/main/scala/Chisel/util/Decoupled.scala
+++ b/src/main/scala/Chisel/util/Decoupled.scala
@@ -106,8 +106,8 @@ class Queue[T <: Data](gen: T, val entries: Int,
                        flow: Boolean = false,
                        override_reset: Option[Bool] = None)
 extends Module(override_reset=override_reset) {
-  def this(gen: T, entries: Int, pipe: Boolean, flow: Boolean, reset: Bool) =
-    this(gen, entries, pipe, flow, Some(reset))
+  def this(gen: T, entries: Int, pipe: Boolean, flow: Boolean, _reset: Bool) =
+    this(gen, entries, pipe, flow, Some(_reset))
   
   val io = new QueueIO(gen, entries)
 
-- 
cgit v1.2.3