aboutsummaryrefslogtreecommitdiffstats
path: root/lib/edoc
diff options
context:
space:
mode:
authorTuncer Ayaz <[email protected]>2010-09-12 17:55:22 +0200
committerBjörn Gustavsson <[email protected]>2010-09-15 14:46:23 +0200
commitfa669f5a5cd78c157cb2f41ee858d105206eb004 (patch)
tree59ce943834d8a120d0cfa5ae82f9acfc1f07b29a /lib/edoc
parentc9a40f46a37bd0891779d9204244a86ffb34a683 (diff)
downloadotp-fa669f5a5cd78c157cb2f41ee858d105206eb004.tar.gz
otp-fa669f5a5cd78c157cb2f41ee858d105206eb004.tar.bz2
otp-fa669f5a5cd78c157cb2f41ee858d105206eb004.zip
edoc: Do not auto-import error/1
Resolve name clash with auto-imported BIF error/1.
Diffstat (limited to 'lib/edoc')
-rw-r--r--lib/edoc/src/edoc.erl2
-rw-r--r--lib/edoc/src/edoc_run.erl2
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl
index ec452a5929..75b3bb451a 100644
--- a/lib/edoc/src/edoc.erl
+++ b/lib/edoc/src/edoc.erl
@@ -58,6 +58,8 @@
read_comments/1, read_comments/2,
read_source/1, read_source/2]).
+-compile({no_auto_import,[error/1]}).
+
-import(edoc_report, [report/2, report/3, error/1, error/3]).
-include("edoc.hrl").
diff --git a/lib/edoc/src/edoc_run.erl b/lib/edoc/src/edoc_run.erl
index 37025d6621..96e5ea4631 100644
--- a/lib/edoc/src/edoc_run.erl
+++ b/lib/edoc/src/edoc_run.erl
@@ -42,6 +42,8 @@
-export([file/1, application/1, packages/1, files/1, toc/1]).
+-compile({no_auto_import,[error/1]}).
+
-import(edoc_report, [report/2, error/1]).