aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools/src
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-09-10 14:37:02 +0200
committerPatrik Nyblom <[email protected]>2010-09-10 14:37:02 +0200
commit6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02 (patch)
tree07492ef6b7f98ef05ecc47518038980173996480 /lib/tools/src
parentbf276aef756681bd2ccb31aff54b646ff6a68d73 (diff)
parent19a3f0c5bab37ba261abbca6c0253c1e3cb4d3ac (diff)
downloadotp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.tar.gz
otp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.tar.bz2
otp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.zip
Merge branch 'pan/added-autoimports/OTP-8763' into dev
* pan/added-autoimports/OTP-8763: Remove warnings for clashes with new autoimported BIFs Add testcase for autoimport and the erlang.xml doc consistency Correct erlang.xml regarding autoimports Add new autoimports for R14B
Diffstat (limited to 'lib/tools/src')
-rw-r--r--lib/tools/src/xref_base.erl2
-rw-r--r--lib/tools/src/xref_compiler.erl2
-rw-r--r--lib/tools/src/xref_utils.erl2
3 files changed, 6 insertions, 0 deletions
diff --git a/lib/tools/src/xref_base.erl b/lib/tools/src/xref_base.erl
index 1656899e8f..93f0e9c0c8 100644
--- a/lib/tools/src/xref_base.erl
+++ b/lib/tools/src/xref_base.erl
@@ -19,6 +19,8 @@
-module(xref_base).
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
-export([new/0, new/1, delete/1,
add_directory/2, add_directory/3,
add_module/2, add_module/3,
diff --git a/lib/tools/src/xref_compiler.erl b/lib/tools/src/xref_compiler.erl
index c80eb0e669..1445e135be 100644
--- a/lib/tools/src/xref_compiler.erl
+++ b/lib/tools/src/xref_compiler.erl
@@ -31,6 +31,8 @@
-define(CALL(F), ok).
-endif.
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
-export([compile/2]).
-export([update_graph_counter/3]).
diff --git a/lib/tools/src/xref_utils.erl b/lib/tools/src/xref_utils.erl
index 0ef199cec7..9d4a175d88 100644
--- a/lib/tools/src/xref_utils.erl
+++ b/lib/tools/src/xref_utils.erl
@@ -18,6 +18,8 @@
%%
-module(xref_utils).
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
-export([xset/2]).
-export([is_directory/1, file_info/1, fa_to_mfa/2]).