3 files changed, 10 insertions, 7 deletions
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc
index 956b85f1d..3b215b849 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc
@@ -26,6 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <cassert>
 #include <numeric>
 
 #include "base/stl_helpers.hh"
@@ -198,8 +199,8 @@ SimpleNetwork::makeInternalLink(SwitchID src, SwitchID dest,
 void
 SimpleNetwork::checkNetworkAllocation(NodeID id, bool ordered, int network_num)
 {
-    ASSERT(id < m_nodes);
-    ASSERT(network_num < m_virtual_networks);
+    assert(id < m_nodes);
+    assert(network_num < m_virtual_networks);
 
     if (ordered) {
         m_ordered[network_num] = true;
diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc
index 096a8f466..55e5b4e78 100644
--- a/src/mem/ruby/network/simple/Throttle.cc
+++ b/src/mem/ruby/network/simple/Throttle.cc
@@ -26,6 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <cassert>
+
 #include "base/cprintf.hh"
 #include "mem/protocol/Protocol.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
@@ -45,8 +47,6 @@ const int PRIORITY_SWITCH_LIMIT = 128;
 
 static int network_message_to_size(NetworkMessage* net_msg_ptr);
 
-extern ostream *debug_cout_ptr;
-
 Throttle::Throttle(int sID, NodeID node, int link_latency,
     int link_bandwidth_multiplier)
 {
@@ -67,7 +67,7 @@ Throttle::init(NodeID node, int link_latency, int link_bandwidth_multiplier)
     m_node = node;
     m_vnets = 0;
 
-    ASSERT(link_bandwidth_multiplier > 0);
+    assert(link_bandwidth_multiplier > 0);
     m_link_bandwidth_multiplier = link_bandwidth_multiplier;
     m_link_latency = link_latency;
 
diff --git a/src/mem/ruby/network/simple/Topology.cc b/src/mem/ruby/network/simple/Topology.cc
index 5e6bf9939..d79491ef2 100644
--- a/src/mem/ruby/network/simple/Topology.cc
+++ b/src/mem/ruby/network/simple/Topology.cc
@@ -26,6 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <cassert>
+
 #include "mem/protocol/MachineType.hh"
 #include "mem/protocol/Protocol.hh"
 #include "mem/protocol/TopologyType.hh"
@@ -224,8 +226,8 @@ void
 Topology::addLink(SwitchID src, SwitchID dest, int link_latency,
     int bw_multiplier, int link_weight)
 {
-    ASSERT(src <= m_number_of_switches+m_nodes+m_nodes);
-    ASSERT(dest <= m_number_of_switches+m_nodes+m_nodes);
+    assert(src <= m_number_of_switches+m_nodes+m_nodes);
+    assert(dest <= m_number_of_switches+m_nodes+m_nodes);
     m_links_src_vector.push_back(src);
     m_links_dest_vector.push_back(dest);
     m_links_latency_vector.push_back(link_latency);