diff options
author | Björn Gustavsson <[email protected]> | 2010-09-21 13:33:39 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2010-09-21 13:33:45 +0200 |
commit | 4a8e5d94c9128731d16ae3c63cf9c86d1331f37b (patch) | |
tree | 6510e886a7c50f67bf77721c3b65f7cd75d7e956 /lib/hipe | |
parent | 5d95cc15f16a9894676ebab9173d7c6a62d757da (diff) | |
parent | 42766892694b0adfb9feb4b9676da8ff8d7c266c (diff) | |
download | otp-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/hipe')
-rw-r--r-- | lib/hipe/icode/hipe_icode_type.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/hipe/icode/hipe_icode_type.erl b/lib/hipe/icode/hipe_icode_type.erl index 28198467f7..6726d62b53 100644 --- a/lib/hipe/icode/hipe_icode_type.erl +++ b/lib/hipe/icode/hipe_icode_type.erl @@ -39,6 +39,8 @@ update__info/2, new__info/1, return__info/1, return_none/0, return_none_args/2, return_any_args/2]). +-compile({no_auto_import,[min/2,max/2]}). + %%===================================================================== -include("../main/hipe.hrl"). |