diff options
| author | Lars Thorsen <[email protected]> | 2011-10-19 16:54:20 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2011-10-19 16:54:20 +0200 |
| commit | 19a71e26888ab11dac720cc91e0e255e06812edf (patch) | |
| tree | aa961877c877fcac00424265346882d8357c28a7 | |
| parent | ff1fb99fb54ef93cd778366993a448fde2b44d82 (diff) | |
| parent | f561a98a9b89738467b52ab5213562de753f6ad2 (diff) | |
| download | otp-19a71e26888ab11dac720cc91e0e255e06812edf.tar.gz otp-19a71e26888ab11dac720cc91e0e255e06812edf.tar.bz2 otp-19a71e26888ab11dac720cc91e0e255e06812edf.zip | |
Merge branch 'maint-r14'
* maint-r14:
Fix match bug
| -rw-r--r-- | lib/ic/doc/src/notes.xml | 16 | ||||
| -rw-r--r-- | lib/ic/src/ic_pragma.erl | 6 | ||||
| -rw-r--r-- | lib/ic/vsn.mk | 2 |
3 files changed, 20 insertions, 4 deletions
diff --git a/lib/ic/doc/src/notes.xml b/lib/ic/doc/src/notes.xml index de519d5f84..ff289bd76c 100644 --- a/lib/ic/doc/src/notes.xml +++ b/lib/ic/doc/src/notes.xml @@ -31,6 +31,22 @@ </header> <section> + <title>IC 4.2.28</title> + + <section> + <title>Fixed Bugs and Malfunctions</title> + <list type="bulleted"> + <item> + <p> + Incorrect use of ets:match changed to ets:match_object.</p> + <p> + Own Id: OTP-9630 </p> + </item> + </list> + </section> + </section> + + <section> <title>IC 4.2.27</title> <section> diff --git a/lib/ic/src/ic_pragma.erl b/lib/ic/src/ic_pragma.erl index 7f2216b9dc..beaa2852ab 100644 --- a/lib/ic/src/ic_pragma.erl +++ b/lib/ic/src/ic_pragma.erl @@ -1601,7 +1601,7 @@ remove_inheriters(S,RS,InheriterList) -> ReducedInhList; _Other -> CleanList = - ets:match(S, {inherits,'_','_'}), + ets:match_object(S, {inherits,'_','_'}), % CodeOptList = % [X || X <- EtsList, element(1,X) == codeopt], NoInheriters =remove_inheriters2(S,ReducedInhList,CleanList), @@ -1648,7 +1648,7 @@ remove_inh([X],[Y],List,EtsList) -> %%%---------------------------------------------- remove_inherited(S,InheriterList) -> CleanList = - ets:match(S, {inherits, '_', '_'}), + ets:match_object(S, {inherits, '_', '_'}), remove_inherited(S,InheriterList,CleanList). @@ -1766,7 +1766,7 @@ inherits2(_X,Y,Z,EtsList) -> %% false otherwise %% is_inherited_by(Interface1,Interface2,PragmaTab) -> - InheritsList = ets:match(PragmaTab, {inherits, '_', '_'}), + InheritsList = ets:match_object(PragmaTab, {inherits, '_', '_'}), inherits(Interface2,Interface1,InheritsList). diff --git a/lib/ic/vsn.mk b/lib/ic/vsn.mk index 6561ccd2a7..703c8d29eb 100644 --- a/lib/ic/vsn.mk +++ b/lib/ic/vsn.mk @@ -1 +1 @@ -IC_VSN = 4.2.27 +IC_VSN = 4.2.28 |