[BACK]Return to patch-net__scope.cc CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / cad / verilog-current / patches

File: [cvs.NetBSD.org] / pkgsrc / cad / verilog-current / patches / Attic / patch-net__scope.cc (download)

Revision 1.1, Thu May 23 15:00:00 2013 UTC (8 years, 8 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2

Casting 0 to an iterator is not portable. Just use end() in that case.

$NetBSD: patch-net__scope.cc,v 1.1 2013/05/23 15:00:00 joerg Exp $

--- net_scope.cc.orig	2013-05-22 14:46:10.000000000 +0000
+++ net_scope.cc
@@ -221,11 +221,7 @@ map<perm_string,NetScope::param_expr_t>:
       if (idx != parameters.end())
 	    return idx;
 
-      idx = localparams.find(perm_string::literal(key));
-      if (idx != localparams.end())
-	    return idx;
-
-      return (map<perm_string,param_expr_t>::iterator) 0;
+      return localparams.find(perm_string::literal(key));
 }
 
 NetScope::TYPE NetScope::type() const