diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-12-22 20:10:34 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-12-22 20:10:34 +0000 |
| commit | 8cca4ed8d859659ef68f6cf2500a1f725008d892 (patch) | |
| tree | 43c595a3de6094023b27105bbb7a2d6eab0b9707 /pbx/ael/ael-test/ref.ael-vtest17 | |
| parent | 17d2c0f78765b0b5639c4627c21be9598382f3fb (diff) | |
Merged revisions 299449 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r299449 | tilghman | 2010-12-22 14:05:02 -0600 (Wed, 22 Dec 2010) | 15 lines
Merged revisions 299448 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r299448 | tilghman | 2010-12-22 14:03:30 -0600 (Wed, 22 Dec 2010) | 8 lines
Resolve warnings by disambiguating the "s" extension as used by chan_dahdi from the "s" extension as used by the AEL macros.
(closes issue #18480)
Reported by: nivek
Patches:
20101215__issue18480__2.diff.txt uploaded by tilghman (license 14)
Tested by: nivek
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299450 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/ael/ael-test/ref.ael-vtest17')
| -rw-r--r-- | pbx/ael/ael-test/ref.ael-vtest17 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pbx/ael/ael-test/ref.ael-vtest17 b/pbx/ael/ael-test/ref.ael-vtest17 index 44b3bd47d..0a17aa0fc 100644 --- a/pbx/ael/ael-test/ref.ael-vtest17 +++ b/pbx/ael/ael-test/ref.ael-vtest17 @@ -40,7 +40,7 @@ exten => 81,9,Set(time2=${EPOCH}) exten => 81,10,Verbose(The time diff is $[${time2} - ${time1} ] seconds) exten => 81,11,Verbose(Which means that the priorities/sec = $[4* ${iterations} / (${time2} - ${time1}) ]) exten => 81,12,SayNumber($[4 * ${iterations} / (${time2} - ${time1}) ]) -exten => 82,1,Gosub(ndeep,s,1(100000)) +exten => 82,1,Gosub(ndeep,~~s~~,1(100000)) exten => 82,2,Verbose(Finished 100000 levels deep call!) exten => 83,1,Set(~~EXTEN~~=${EXTEN}) exten => 83,2,Goto(sw_2_${~~EXTEN~~},10) @@ -56,13 +56,13 @@ exten => _sw_2_8X,11,Goto(sw_2_99,10) [ndeep] -exten => s,1,Set(LOCAL(level)=${ARG1}) -exten => s,2,GotoIf($[${level} == 0]?3:5) -exten => s,3,Verbose(2|Got to Level 0) -exten => s,4,Return() -exten => s,5,NoOp(Finish if_ndeep_3) -exten => s,6,Gosub(ndeep,s,1($[${level}-1])) -exten => s,7,Return() +exten => ~~s~~,1,Set(LOCAL(level)=${ARG1}) +exten => ~~s~~,2,GotoIf($[${level} == 0]?3:5) +exten => ~~s~~,3,Verbose(2|Got to Level 0) +exten => ~~s~~,4,Return() +exten => ~~s~~,5,NoOp(Finish if_ndeep_3) +exten => ~~s~~,6,Gosub(ndeep,~~s~~,1($[${level}-1])) +exten => ~~s~~,7,Return() [t1extension] |