neuron/nrn
changeset 698:15e851bf347c trunk
The hoc variable 'in' in the standard library was changed to in_ to avoid
conflicts with a potentially defined USEION n ... statement in a mod file.
| author | Michael Hines <michael.hines@yale.edu> |
|---|---|
| date | Fri, 06 Jul 2012 10:53:36 -0400 |
| parents | 3a811a5ca87b |
| children | dc82c428a45f |
| files | share/lib/hoc/mview/distinctparm.hoc share/lib/hoc/mview/mview1.hoc |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line diff
1.1 --- a/share/lib/hoc/mview/distinctparm.hoc Thu Jul 05 12:41:16 2012 -0400 1.2 +++ b/share/lib/hoc/mview/distinctparm.hoc Fri Jul 06 10:53:36 2012 -0400 1.3 @@ -5,7 +5,7 @@ 1.4 objref mlist, pvec, ms, inhomo, distinctvalues 1.5 strdef tstr, mname, pname 1.6 1.7 -in=0 1.8 +in_=0 1.9 x=0 1.10 is_ion = 0 1.11 1.12 @@ -83,9 +83,9 @@ 1.13 for k=0, size-1 { 1.14 pvec.resize(0) 1.15 if (size > 1) { 1.16 - sprint(tstr, "for in=0, tobj.count-1 {pvec.append(tobj.object(in).%s[%d])}", pname, k) 1.17 + sprint(tstr, "for in_=0, tobj.count-1 {pvec.append(tobj.object(in_).%s[%d])}", pname, k) 1.18 }else{ 1.19 - sprint(tstr, "for in=0, tobj.count-1 {pvec.append(tobj.object(in).%s)}", pname) 1.20 + sprint(tstr, "for in_=0, tobj.count-1 {pvec.append(tobj.object(in_).%s)}", pname) 1.21 } 1.22 execute(tstr, this) 1.23 distinct(mname) 1.24 @@ -98,7 +98,7 @@ 1.25 tobj = new List(mname) if (tobj.count > 1) { 1.26 for modelview.strings(pname, "weight", "delay", "threshold") { 1.27 pvec.resize(0) 1.28 - sprint(tstr, "for in=0, tobj.count-1 {pvec.append(tobj.object(in).%s)}", pname) 1.29 + sprint(tstr, "for in_=0, tobj.count-1 {pvec.append(tobj.object(in_).%s)}", pname) 1.30 execute(tstr, this) 1.31 distinct(mname) 1.32 }