File qucs-0.0.18-gcc6.patch of Package qucs
Index: qucs-0.0.18/qucs-core/src/components/verilog/hic2_full.core.cpp
===================================================================
--- qucs-0.0.18.orig/qucs-core/src/components/verilog/hic2_full.core.cpp
+++ qucs-0.0.18/qucs-core/src/components/verilog/hic2_full.core.cpp
@@ -12,6 +12,8 @@
#include <config.h>
#endif
+#include <cmath>
+
#include "hic2_full.analogfunction.h"
#include "component.h"
#include "device.h"
@@ -9642,7 +9644,7 @@ d_Q_Vci_ei=Q_pT_Vci_ei;
#endif
d_Q=Q_pT;
while
-(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100)))
+(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100)))
{
#if defined(_DYNAMIC)
d_Q0=d_Q;
Index: qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p1.core.cpp
===================================================================
--- qucs-0.0.18.orig/qucs-core/src/components/verilog/hicumL2V2p1.core.cpp
+++ qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p1.core.cpp
@@ -12,6 +12,8 @@
#include <config.h>
#endif
+#include <cmath>
+
#include "hicumL2V2p1.analogfunction.h"
#include "component.h"
#include "device.h"
@@ -4895,7 +4897,7 @@ d_Q_Vci_ei=Q_pT_Vci_ei;
#endif
d_Q=Q_pT;
while
-(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100)))
+(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100)))
{
#if defined(_DYNAMIC)
d_Q0=d_Q;
Index: qucs-0.0.18/qucs-core/src/components/verilog/bsim3v34nMOS.core.cpp
===================================================================
--- qucs-0.0.18.orig/qucs-core/src/components/verilog/bsim3v34nMOS.core.cpp
+++ qucs-0.0.18/qucs-core/src/components/verilog/bsim3v34nMOS.core.cpp
@@ -12,6 +12,8 @@
#include <config.h>
#endif
+#include <cmath>
+
#include "bsim3v34nMOS.analogfunction.h"
#include "component.h"
#include "device.h"
@@ -8432,9 +8434,9 @@ if
fourkt=(5.5226012e-23*Temp);
leffx2=(leff*leff);
_save_flickernoise2(drainp,sourcep,((KF*pow(cdrain,AF))/(cox*leffx2)),EF,"flicker");
-_save_whitenoise2(drainp,sourcep,(((fourkt*ueff)*abs(qinv))/leffx2),"channel");
-_save_whitenoise2(drain,drainp,abs((fourkt*drainConductance)),"thermal");
-_save_whitenoise2(sourcep,source,abs((fourkt*sourceConductance)),"thermal");
+_save_whitenoise2(drainp,sourcep,(((fourkt*ueff)*std::abs(qinv))/leffx2),"channel");
+_save_whitenoise2(drain,drainp,std::abs((fourkt*drainConductance)),"thermal");
+_save_whitenoise2(sourcep,source,std::abs((fourkt*sourceConductance)),"thermal");
}
/* ------------------ end of verilog analog equations --------------------- */
Index: qucs-0.0.18/qucs-core/src/components/verilog/bsim3v34pMOS.core.cpp
===================================================================
--- qucs-0.0.18.orig/qucs-core/src/components/verilog/bsim3v34pMOS.core.cpp
+++ qucs-0.0.18/qucs-core/src/components/verilog/bsim3v34pMOS.core.cpp
@@ -12,6 +12,8 @@
#include <config.h>
#endif
+#include <cmath>
+
#include "bsim3v34pMOS.analogfunction.h"
#include "component.h"
#include "device.h"
@@ -8432,9 +8434,9 @@ if
fourkt=(5.5226012e-23*Temp);
leffx2=(leff*leff);
_save_flickernoise2(drainp,sourcep,((KF*pow(cdrain,AF))/(cox*leffx2)),EF,"flicker");
-_save_whitenoise2(drainp,sourcep,(((fourkt*ueff)*abs(qinv))/leffx2),"channel");
-_save_whitenoise2(drain,drainp,abs((fourkt*drainConductance)),"thermal");
-_save_whitenoise2(sourcep,source,abs((fourkt*sourceConductance)),"thermal");
+_save_whitenoise2(drainp,sourcep,(((fourkt*ueff)*std::abs(qinv))/leffx2),"channel");
+_save_whitenoise2(drain,drainp,std::abs((fourkt*drainConductance)),"thermal");
+_save_whitenoise2(sourcep,source,std::abs((fourkt*sourceConductance)),"thermal");
}
/* ------------------ end of verilog analog equations --------------------- */
Index: qucs-0.0.18/qucs-core/src/components/verilog/bsim4v30nMOS.core.cpp
===================================================================
--- qucs-0.0.18.orig/qucs-core/src/components/verilog/bsim4v30nMOS.core.cpp
+++ qucs-0.0.18/qucs-core/src/components/verilog/bsim4v30nMOS.core.cpp
@@ -12,6 +12,8 @@
#include <config.h>
#endif
+#include <cmath>
+
#include "bsim4v30nMOS.analogfunction.h"
#include "component.h"
#include "device.h"
@@ -13629,16 +13631,16 @@ if
{
fourkt=(5.5226012e-23*Temp);
leffx2=(leff*leff);
-_save_whitenoise2(drainp,sourcep,((((fourkt*NTNOI)*ueff)*abs((qd+qs)))/leffx2),"channel");
+_save_whitenoise2(drainp,sourcep,((((fourkt*NTNOI)*ueff)*std::abs((qd+qs)))/leffx2),"channel");
}
if
(FNOIMOD==0)
{
leffx2=(leff*leff);
-_save_flickernoise2(drainp,sourcep,((KF*pow(abs(cdrain),AF))/(cox*leffx2)),EF,"flicker");
+_save_flickernoise2(drainp,sourcep,((KF*pow(std::abs(cdrain),AF))/(cox*leffx2)),EF,"flicker");
}
-_save_whitenoise2(drain,drainp,abs((fourkt*gdtot)),"thermal");
-_save_whitenoise2(sourcep,source,abs((fourkt*gstot)),"thermal");
+_save_whitenoise2(drain,drainp,std::abs((fourkt*gdtot)),"thermal");
+_save_whitenoise2(sourcep,source,std::abs((fourkt*gstot)),"thermal");
/* ------------------ end of verilog analog equations --------------------- */
Index: qucs-0.0.18/qucs-core/src/components/verilog/bsim4v30pMOS.core.cpp
===================================================================
--- qucs-0.0.18.orig/qucs-core/src/components/verilog/bsim4v30pMOS.core.cpp
+++ qucs-0.0.18/qucs-core/src/components/verilog/bsim4v30pMOS.core.cpp
@@ -12,6 +12,8 @@
#include <config.h>
#endif
+#include <cmath>
+
#include "bsim4v30pMOS.analogfunction.h"
#include "component.h"
#include "device.h"
@@ -13629,16 +13631,16 @@ if
{
fourkt=(5.5226012e-23*Temp);
leffx2=(leff*leff);
-_save_whitenoise2(drainp,sourcep,((((fourkt*NTNOI)*ueff)*abs((qd+qs)))/leffx2),"channel");
+_save_whitenoise2(drainp,sourcep,((((fourkt*NTNOI)*ueff)*std::abs((qd+qs)))/leffx2),"channel");
}
if
(FNOIMOD==0)
{
leffx2=(leff*leff);
-_save_flickernoise2(drainp,sourcep,((KF*pow(abs(cdrain),AF))/(cox*leffx2)),EF,"flicker");
+_save_flickernoise2(drainp,sourcep,((KF*pow(std::abs(cdrain),AF))/(cox*leffx2)),EF,"flicker");
}
-_save_whitenoise2(drain,drainp,abs((fourkt*gdtot)),"thermal");
-_save_whitenoise2(sourcep,source,abs((fourkt*gstot)),"thermal");
+_save_whitenoise2(drain,drainp,std::abs((fourkt*gdtot)),"thermal");
+_save_whitenoise2(sourcep,source,std::abs((fourkt*gstot)),"thermal");
/* ------------------ end of verilog analog equations --------------------- */
Index: qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p24.core.cpp
===================================================================
--- qucs-0.0.18.orig/qucs-core/src/components/verilog/hicumL2V2p24.core.cpp
+++ qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p24.core.cpp
@@ -12,6 +12,8 @@
#include <config.h>
#endif
+#include <cmath>
+
#include "hicumL2V2p24.analogfunction.h"
#include "component.h"
#include "device.h"
@@ -6090,7 +6092,7 @@ d_Q_Vci_ei=Q_pT_Vci_ei;
#endif
d_Q=Q_pT;
while
-(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100)))
+(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100)))
{
#if defined(_DYNAMIC)
d_Q0=d_Q;
@@ -11855,10 +11857,10 @@ _save_flickernoise2(bp,ei,flicker_Pwr,1.
}
twoq=(2.0*1.602176462e-19);
_save_whitenoise2(ci,bi,(twoq*iavl),"shot");
-_save_whitenoise2(bi,ci,(twoq*abs(ibci)),"shot");
+_save_whitenoise2(bi,ci,(twoq*std::abs(ibci)),"shot");
_save_whitenoise2(bp,ei,(twoq*ibep),"shot");
-_save_whitenoise2(bp,ci,(twoq*abs(ijbcx)),"shot");
-_save_whitenoise2(si,ci,(twoq*abs(ijsc)),"shot");
+_save_whitenoise2(bp,ci,(twoq*std::abs(ijbcx)),"shot");
+_save_whitenoise2(si,ci,(twoq*std::abs(ijsc)),"shot");
_save_whitenoise1(n1,((2*1.602176462e-19)*ibei),"shot");
_load_static_residual1(n1,NP(n1));
#if defined(_DERIVATE)
Index: qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p31n.core.cpp
===================================================================
--- qucs-0.0.18.orig/qucs-core/src/components/verilog/hicumL2V2p31n.core.cpp
+++ qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p31n.core.cpp
@@ -12,6 +12,8 @@
#include <config.h>
#endif
+#include <cmath>
+
#include "hicumL2V2p31n.analogfunction.h"
#include "component.h"
#include "device.h"
@@ -6726,7 +6728,7 @@ d_Q_Vci_ei=Q_pT_Vci_ei;
#endif
d_Q=Q_pT;
while
-(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100)))
+(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100)))
{
#if defined(_DYNAMIC)
d_Q0=d_Q;
@@ -12817,10 +12819,10 @@ _save_flickernoise2(ei,e,flicker_Pwr,1.0
}
twoq=(2.0*1.602176462e-19);
_save_whitenoise2(ci,bi,(twoq*iavl),"shot");
-_save_whitenoise2(bi,ci,(twoq*abs(ibci)),"shot");
+_save_whitenoise2(bi,ci,(twoq*std::abs(ibci)),"shot");
_save_whitenoise2(bp,ei,(twoq*ibep),"shot");
-_save_whitenoise2(bp,ci,(twoq*abs(ijbcx)),"shot");
-_save_whitenoise2(si,ci,(twoq*abs(ijsc)),"shot");
+_save_whitenoise2(bp,ci,(twoq*std::abs(ijbcx)),"shot");
+_save_whitenoise2(si,ci,(twoq*std::abs(ijsc)),"shot");
if
(flcono==1)
{
Index: qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p23.core.cpp
===================================================================
--- qucs-0.0.18.orig/qucs-core/src/components/verilog/hicumL2V2p23.core.cpp
+++ qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p23.core.cpp
@@ -12,6 +12,8 @@
#include <config.h>
#endif
+#include <cmath>
+
#include "hicumL2V2p23.analogfunction.h"
#include "component.h"
#include "device.h"
@@ -11502,7 +11504,7 @@ d_Q_Vci_ei=Q_pT_Vci_ei;
#endif
d_Q=Q_pT;
while
-(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100)))
+(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100)))
{
#if defined(_DYNAMIC)
d_Q0=d_Q;
@@ -23949,10 +23951,10 @@ _save_flickernoise2(bp,ei,flicker_Pwr,1.
}
twoq=(2.0*1.602176462e-19);
_save_whitenoise2(ci,bi,(twoq*iavl),"shot");
-_save_whitenoise2(bi,ci,(twoq*abs(ibci)),"shot");
+_save_whitenoise2(bi,ci,(twoq*std::abs(ibci)),"shot");
_save_whitenoise2(bp,ei,(twoq*ibep),"shot");
-_save_whitenoise2(bp,ci,(twoq*abs(ijbcx)),"shot");
-_save_whitenoise2(si,ci,(twoq*abs(ijsc)),"shot");
+_save_whitenoise2(bp,ci,(twoq*std::abs(ijbcx)),"shot");
+_save_whitenoise2(si,ci,(twoq*std::abs(ijsc)),"shot");
_save_whitenoise1(n1,((2*1.602176462e-19)*ibei),"shot");
_load_static_residual1(n1,NP(n1));
#if defined(_DERIVATE)