diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-04-01 11:49:56 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-04-01 11:49:56 +0200 |
| commit | ac1f6ffb557c5e702722e8b74f616c55cee2cee3 (patch) | |
| tree | 1ece5d726543c0cd49d005fdb16d36b11481c5e4 /erts/preloaded | |
| parent | 3ccf4a77ee8ff4ca86ec2c46c2645607c094e800 (diff) | |
| parent | fbb05239aeccc400aa4e4a359a3fb81ef555e441 (diff) | |
| download | otp-ac1f6ffb557c5e702722e8b74f616c55cee2cee3.tar.gz otp-ac1f6ffb557c5e702722e8b74f616c55cee2cee3.tar.bz2 otp-ac1f6ffb557c5e702722e8b74f616c55cee2cee3.zip | |
Merge branch 'egil/maps-doc'
* egil/maps-doc:
doc: Add Maps example for sequential programming
doc: Mention map expressions and map guards
doc: Add maps to reference manual
edoc: Add map/0 as a new predefined type
doc: Descripe Maps type syntax
doc: Clearify language of user-defined attributes
doc: Document Maps datatype in reference manual
erts: Document map guard functions
erts: Fix is_map/1 spec
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index fbc37bd955..cabbbd191f 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -1745,9 +1745,9 @@ is_pid(_Term) -> erlang:nif_error(undefined). %% Shadowed by erl_bif_types: erlang:is_map/1 --spec is_map(Map) -> boolean() when - Map :: map(). -is_map(_Map) -> +-spec is_map(Term) -> boolean() when + Term :: term(). +is_map(_Term) -> erlang:nif_error(undefined). %% Shadowed by erl_bif_types: erlang:is_port/1 |