aboutsummaryrefslogtreecommitdiffstats
path: root/lib/edoc/src/edoc.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2010-09-21 13:33:39 +0200
committerBjörn Gustavsson <[email protected]>2010-09-21 13:33:45 +0200
commit4a8e5d94c9128731d16ae3c63cf9c86d1331f37b (patch)
tree6510e886a7c50f67bf77721c3b65f7cd75d7e956 /lib/edoc/src/edoc.erl
parent5d95cc15f16a9894676ebab9173d7c6a62d757da (diff)
parent42766892694b0adfb9feb4b9676da8ff8d7c266c (diff)
downloadotp-4a8e5d94c9128731d16ae3c63cf9c86d1331f37b.tar.gz
otp-4a8e5d94c9128731d16ae3c63cf9c86d1331f37b.tar.bz2
otp-4a8e5d94c9128731d16ae3c63cf9c86d1331f37b.zip
Merge branch 'ta/eliminate-warnings' into dev
* ta/eliminate-warnings: mnesia: Do not auto-import error/2 hipe: Do not auto-import min/2 and max/2 edoc: Do not auto-import error/1 OTP-8855
Diffstat (limited to 'lib/edoc/src/edoc.erl')
-rw-r--r--lib/edoc/src/edoc.erl2
1 files changed, 2 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").