From 07ac680c4ff0effbc31b794014e0807bb484b534 Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 23 May 2013 15:00:00 +0000 Subject: Casting 0 to an iterator is not portable. Just use end() in that case. --- cad/verilog-current/distinfo | 3 ++- cad/verilog-current/patches/patch-net__scope.cc | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 cad/verilog-current/patches/patch-net__scope.cc (limited to 'cad') diff --git a/cad/verilog-current/distinfo b/cad/verilog-current/distinfo index 0d55ae1bdb2..e6363a664ff 100644 --- a/cad/verilog-current/distinfo +++ b/cad/verilog-current/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.31 2011/11/26 17:10:24 joerg Exp $ +$NetBSD: distinfo,v 1.32 2013/05/23 15:00:00 joerg Exp $ SHA1 (verilog-20090923.tar.gz) = 1836ebc4ef78341fb1a077e807c8d5b195ebb253 RMD160 (verilog-20090923.tar.gz) = 32a009d1390e71721d3a72a1940b655ed1853ba5 Size (verilog-20090923.tar.gz) = 1121376 bytes SHA1 (patch-ad) = 9492af75153405c49076f2dcd11d2dc338640514 +SHA1 (patch-net__scope.cc) = 97cf7d099b30b3549ad6262022ca32e8790b5d66 SHA1 (patch-pform__disciplines.cc) = 113365b68723462791728e6f998685a4ebca3547 diff --git a/cad/verilog-current/patches/patch-net__scope.cc b/cad/verilog-current/patches/patch-net__scope.cc new file mode 100644 index 00000000000..43a05244ec4 --- /dev/null +++ b/cad/verilog-current/patches/patch-net__scope.cc @@ -0,0 +1,17 @@ +$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: + if (idx != parameters.end()) + return idx; + +- idx = localparams.find(perm_string::literal(key)); +- if (idx != localparams.end()) +- return idx; +- +- return (map::iterator) 0; ++ return localparams.find(perm_string::literal(key)); + } + + NetScope::TYPE NetScope::type() const -- cgit v1.2.3