From 22f91d2d34d661466008a2f5d4d2e1d093501b7d Mon Sep 17 00:00:00 2001
From: Cary R <cygcary@yahoo.com>
Date: Mon, 17 May 2010 09:25:02 -0700
Subject: [PATCH] A NULL iterator is not portable.

Trying to return a NULL iterator on failure is not portable. It is
better to assert since we have already verified that a parameter
should exist.
---
 net_scope.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net_scope.cc b/net_scope.cc
index 1d5d224bb..71eade98f 100644
--- a/net_scope.cc
+++ b/net_scope.cc
@@ -228,14 +228,14 @@ map<perm_string,NetScope::param_expr_t>::iterator NetScope::find_parameter(perm_
       map<perm_string,param_expr_t>::iterator idx;
 
       idx = parameters.find(key);
-      if (idx != parameters.end())
-	    return idx;
+      if (idx != parameters.end()) return idx;
 
       idx = localparams.find(perm_string::literal(key));
-      if (idx != localparams.end())
-	    return idx;
+      if (idx != localparams.end()) return idx;
 
-      return (map<perm_string,param_expr_t>::iterator) 0;
+	// To get here the parameter must already exist, so we should
+	// never get here.
+      assert(0);
 }
 
 NetScope::TYPE NetScope::type() const