aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-01-13 22:15:13 +0100
committerBjörn-Egil Dahlberg <[email protected]>2014-01-29 11:08:44 +0100
commitc8ecb6962a923ceb0b7e599d22adef773d042e4a (patch)
tree74de19f12cdacdc0bd94a0e20dd2ac1a02eefe9c
parent228ee23186639c8b66be8ed26def7c8e9cb09059 (diff)
downloadotp-c8ecb6962a923ceb0b7e599d22adef773d042e4a.tar.gz
otp-c8ecb6962a923ceb0b7e599d22adef773d042e4a.tar.bz2
otp-c8ecb6962a923ceb0b7e599d22adef773d042e4a.zip
erts: Remove enif_find_map_value
as it does the same thing as enif_get_map_value. Replace with placeholder to be ABI backward compatible on Windows as long as enif_find_map_value is not called.
-rw-r--r--erts/emulator/beam/erl_nif.c13
-rw-r--r--erts/emulator/beam/erl_nif_api_funcs.h5
2 files changed, 3 insertions, 15 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index c683847aaa..1a539c730f 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 2009-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2009-2014. All Rights Reserved.
*
* The contents of this file are subject to the Erlang Public License,
* Version 1.1, (the "License"); you may not use this file except in
@@ -1663,17 +1663,6 @@ int enif_get_map_value(ErlNifEnv* env,
return erts_maps_get(key, map, value);
}
-int enif_find_map_value(ErlNifEnv* env,
- Eterm map,
- Eterm key,
- Eterm *value)
-{
- if (is_not_map(map)) {
- return 0;
- }
- return erts_maps_get(key, map, value);
-}
-
int enif_make_map_update(ErlNifEnv* env,
Eterm map_in,
Eterm key,
diff --git a/erts/emulator/beam/erl_nif_api_funcs.h b/erts/emulator/beam/erl_nif_api_funcs.h
index 4a5aacad48..71abb5dc8b 100644
--- a/erts/emulator/beam/erl_nif_api_funcs.h
+++ b/erts/emulator/beam/erl_nif_api_funcs.h
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 2009-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2009-2014. All Rights Reserved.
*
* The contents of this file are subject to the Erlang Public License,
* Version 1.1, (the "License"); you may not use this file except in
@@ -154,7 +154,7 @@ ERL_NIF_API_FUNC_DECL(int, enif_get_map_size, (ErlNifEnv* env, ERL_NIF_TERM term
ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM, enif_make_new_map, (ErlNifEnv* env));
ERL_NIF_API_FUNC_DECL(int, enif_make_map_put, (ErlNifEnv* env, ERL_NIF_TERM map_in, ERL_NIF_TERM key, ERL_NIF_TERM value, ERL_NIF_TERM* map_out));
ERL_NIF_API_FUNC_DECL(int, enif_get_map_value, (ErlNifEnv* env, ERL_NIF_TERM map, ERL_NIF_TERM key, ERL_NIF_TERM* value));
-ERL_NIF_API_FUNC_DECL(int, enif_find_map_value, (ErlNifEnv* env, ERL_NIF_TERM map, ERL_NIF_TERM key, ERL_NIF_TERM* value));
+ERL_NIF_API_FUNC_DECL(void, __enif_PLACEHOLDER__, (void));
ERL_NIF_API_FUNC_DECL(int, enif_make_map_update, (ErlNifEnv* env, ERL_NIF_TERM map_in, ERL_NIF_TERM key, ERL_NIF_TERM value, ERL_NIF_TERM* map_out));
ERL_NIF_API_FUNC_DECL(int, enif_make_map_remove, (ErlNifEnv* env, ERL_NIF_TERM map_in, ERL_NIF_TERM key, ERL_NIF_TERM* map_out));
ERL_NIF_API_FUNC_DECL(int, enif_map_iterator_create, (ErlNifEnv *env, ERL_NIF_TERM map, ErlNifMapIterator *iter, ErlNifMapIteratorEntry entry));
@@ -303,7 +303,6 @@ ERL_NIF_API_FUNC_DECL(int, enif_map_iterator_get_pair, (ErlNifEnv *env, ErlNifMa
# define enif_make_new_map ERL_NIF_API_FUNC_MACRO(enif_make_new_map)
# define enif_make_map_put ERL_NIF_API_FUNC_MACRO(enif_map_map_put)
# define enif_get_map_value ERL_NIF_API_FUNC_MACRO(enif_get_map_value)
-# define enif_find_map_value ERL_NIF_API_FUNC_MACRO(enif_find_map_value)
# define enif_make_map_update ERL_NIF_API_FUNC_MACRO(enif_make_map_update)
# define enif_make_map_remove ERL_NIF_API_FUNC_MACRO(enif_make_map_remove)
# define enif_map_iterator_create ERL_NIF_API_FUNC_MACRO(enif_map_iterator_create)