aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaimo Niskanen <raimo@erlang.org>2010-07-07 10:59:33 +0200
committerRaimo Niskanen <raimo@erlang.org>2010-07-07 10:59:33 +0200
commit661c42ab6f1b014e1988d0b33fda35d9e815ccdb (patch)
tree614a937176a11dbc23c5f42714326733b0c69f8e
parentc06512bbe8b84ff073813130bfa0908199c941e4 (diff)
parent8dad90e81443038707cccac66ef0718ac0ff6ee3 (diff)
downloadotp-661c42ab6f1b014e1988d0b33fda35d9e815ccdb.tar.gz
otp-661c42ab6f1b014e1988d0b33fda35d9e815ccdb.tar.bz2
otp-661c42ab6f1b014e1988d0b33fda35d9e815ccdb.zip
Merge branch 'pg/beam_lib_cmp_2_return_type_specification' into dev
* pg/beam_lib_cmp_2_return_type_specification: Fix beam_lib:cmp/2 return type specification
-rw-r--r--lib/stdlib/doc/src/beam_lib.xml1
-rw-r--r--lib/stdlib/src/beam_lib.erl1
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml
index 27308e02f3..adc411e272 100644
--- a/lib/stdlib/doc/src/beam_lib.xml
+++ b/lib/stdlib/doc/src/beam_lib.xml
@@ -341,6 +341,7 @@ chunkref() = chunkname() | chunkid()</code>
<v>Beam1 = Beam2 = beam()</v>
<v>Reason = {modules_different, Module1, Module2}</v>
<v>&nbsp;&nbsp;| {chunks_different, ChunkId}</v>
+ <v>&nbsp;&nbsp;| different_chunks</v>
<v>&nbsp;&nbsp;| Reason1 -- see info/1</v>
<v>&nbsp;Module1 = Module2 = atom()</v>
<v>&nbsp;ChunkId = chunkid()</v>
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl
index 91ff2438c6..e612bf71e7 100644
--- a/lib/stdlib/src/beam_lib.erl
+++ b/lib/stdlib/src/beam_lib.erl
@@ -105,6 +105,7 @@
| info_rsn().
-type cmp_rsn() :: {'modules_different', module(), module()}
| {'chunks_different', chunkid()}
+ | 'different_chunks'
| info_rsn().
%%-------------------------------------------------------------------------