head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.4 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.2 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q2:1.3.0.58 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.56 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.54 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.52 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.50 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.48 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.46 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.44 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.42 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.40 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.38 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.36 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.34 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.32 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.30 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.28 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.26 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.24 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.22 pkgsrc-2008Q1:1.3.0.20 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.18 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.16 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.14 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.12 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.10 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.8 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.6 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.4 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.1.1.0.18 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.16 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.14 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2012.09.05.13.10.37; author dmcmahill; state dead; branches; next 1.3; 1.3 date 2005.11.03.19.56.36; author rillig; state Exp; branches; next 1.2; 1.2 date 2005.03.21.17.35.53; author dmcmahill; state Exp; branches; next 1.1; 1.1 date 2001.04.28.02.36.35; author dmcmahill; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.04.28.02.36.35; author dmcmahill; state Exp; branches; next ; desc @@ 1.4 log @remove simian and simian-docs. The distfile is no longer available and we are not allowed to mirror it. Addresses pkg/45650 @ text @$NetBSD: patch-ad,v 1.3 2005/11/03 19:56:36 rillig Exp $ --- src/reader.cc.orig 1998-12-10 09:02:44.000000000 +0000 +++ src/reader.cc @@@@ -1,6 +1,9 @@@@ /* Reading Input Geometry */ -#include -#include +#include +#include +#include +#include +#include #include #include #include @@@@ -29,7 +32,7 @@@@ void Default(Conductor* c) c->xc=0; c->yc=0; } -void ReadRest(Sys *sis,Conductor* conduc,fstream& fl,int& line) +void ReadRest(Sys *sis,Conductor* conduc,std::fstream& fl,int& line) { char* s1; char *proj; @@@@ -212,19 +215,19 @@@@ void ReadRest(Sys *sis,Conductor* conduc else if (strcmp(s1,"nx")==0) { fl >> s1; if (strcmp(s1,"=")==0) fl >> conduc->dx; - else sscanf(s1,"%c%ld",&dum,&conduc->dx); + else sscanf(s1,"%c%d",&dum,&conduc->dx); } else if (strcmp(s1,"ny=")==0) fl >> conduc->dy; else if (strcmp(s1,"ny")==0) { fl >> s1; if (strcmp(s1,"=")==0) fl >> conduc->dy; - else sscanf(s1,"%c%ld",&dum,&conduc->dy); + else sscanf(s1,"%c%d",&dum,&conduc->dy); } else if (strcmp(s1,"nr=")==0) fl >> conduc->nr; else if (strcmp(s1,"nr")==0) { fl >> s1; if (strcmp(s1,"=")==0) fl >> conduc->nr; - else sscanf(s1,"%c%ld",&dum,&conduc->nr); + else sscanf(s1,"%c%d",&dum,&conduc->nr); } else if ((strncmp(s1,"*",1)==0)||(strncmp(s1,".",1)==0)) { fl.getline(proj,80,'\n'); @@@@ -265,11 +268,11 @@@@ void ReadRest(Sys *sis,Conductor* conduc else if (strncmp(s1,"v=",2)==0) sscanf(s1,"%c%c%le",&dum,&dum,&conduc->v); else if (strncmp(s1,"nx=",3)==0) - sscanf(s1,"%c%c%c%ld",&dum,&dum,&dum,&conduc->dx); + sscanf(s1,"%c%c%c%d",&dum,&dum,&dum,&conduc->dx); else if (strncmp(s1,"ny=",3)==0) - sscanf(s1,"%c%c%c%ld",&dum,&dum,&dum,&conduc->dy); + sscanf(s1,"%c%c%c%d",&dum,&dum,&dum,&conduc->dy); else if (strncmp(s1,"nr=",3)==0) - sscanf(s1,"%c%c%c%ld",&dum,&dum,&dum,&conduc->nr); + sscanf(s1,"%c%c%c%d",&dum,&dum,&dum,&conduc->nr); else if (strncmp(s1,"rx=",3)==0) sscanf(s1,"%c%c%c%le",&dum,&dum,&dum,&conduc->rx); else if (strncmp(s1,"ry=",3)==0) @@@@ -297,7 +300,7 @@@@ void reader(Conductor* conduc,Sys* sis,c ss=new char[80]; s1=new char[80]; - fstream fll(fn,ios::in); + std::fstream fll(fn,std::ios::in); if (!fll) { exit(1); } @@@@ -337,7 +340,7 @@@@ void reader(Conductor* conduc,Sys* sis,c ss=new char[100]; int p_c,l_c; p_c=0; l_c=0; - fstream fl(fn,ios::in); + std::fstream fl(fn,std::ios::in); line=0; do { fl >> ss; @ 1.3 log @Fixed wrong usage of WRKSRC. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.2 2005/03/21 17:35:53 dmcmahill Exp $ @ 1.2 log @simian, meet gcc3 (fix c++ code to work with gcc3) @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- reader.cc.orig 1998-12-10 09:02:44.000000000 +0000 +++ reader.cc @ 1.1 log @Initial revision @ text @d3 25 a27 3 --- reader.cc.orig Thu Dec 10 04:02:44 1998 +++ reader.cc Fri Apr 27 17:00:23 2001 @@@@ -213,5 +213,5 @@@@ d34 1 a34 1 @@@@ -219,5 +219,5 @@@@ d41 1 a41 1 @@@@ -225,5 +225,5 @@@@ d48 3 a50 1 @@@@ -266,9 +266,9 @@@@ d63 19 @ 1.1.1.1 log @initial import of simian-2.1 Surface Impedance Method for Interconnect Analysis. SIMIAN is a two dimensional frequency dependent series impedance extraction tool for inerconnects and transmission lines using conductors of rectangular or circular cross section. The use of the surface ribbon method (SRM) greatly enhances the speed of computation relative to the volume filament method (VFM). @ text @@