diff options
| author | Tuncer Ayaz <[email protected]> | 2010-09-12 17:55:24 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-09-15 14:48:55 +0200 |
| commit | 42766892694b0adfb9feb4b9676da8ff8d7c266c (patch) | |
| tree | aa1b217f905c5fab9ec34146d55473fb6b7baa99 /lib/mnesia | |
| parent | 41693beb6d07c5e3505d1e22319bc0316f1dd640 (diff) | |
| download | otp-42766892694b0adfb9feb4b9676da8ff8d7c266c.tar.gz otp-42766892694b0adfb9feb4b9676da8ff8d7c266c.tar.bz2 otp-42766892694b0adfb9feb4b9676da8ff8d7c266c.zip | |
mnesia: Do not auto-import error/2
Resolve name clash with auto-imported BIF error/2.
Diffstat (limited to 'lib/mnesia')
| -rw-r--r-- | lib/mnesia/src/mnesia_controller.erl | 2 | ||||
| -rw-r--r-- | lib/mnesia/src/mnesia_locker.erl | 2 | ||||
| -rw-r--r-- | lib/mnesia/src/mnesia_log.erl | 2 | ||||
| -rw-r--r-- | lib/mnesia/src/mnesia_monitor.erl | 2 | ||||
| -rw-r--r-- | lib/mnesia/src/mnesia_recover.erl | 1 | ||||
| -rw-r--r-- | lib/mnesia/src/mnesia_subscr.erl | 2 |
6 files changed, 11 insertions, 0 deletions
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl index 0298b382a6..021be8af2a 100644 --- a/lib/mnesia/src/mnesia_controller.erl +++ b/lib/mnesia/src/mnesia_controller.erl @@ -98,6 +98,8 @@ connect_nodes2/3 ]). +-compile({no_auto_import,[error/2]}). + -import(mnesia_lib, [set/2, add/2]). -import(mnesia_lib, [fatal/2, error/2, verbose/2, dbg_out/2]). diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl index cfa3f171b2..6b5770d91e 100644 --- a/lib/mnesia/src/mnesia_locker.erl +++ b/lib/mnesia/src/mnesia_locker.erl @@ -49,6 +49,8 @@ system_code_change/4 ]). +-compile({no_auto_import,[error/2]}). + -include("mnesia.hrl"). -import(mnesia_lib, [dbg_out/2, error/2, verbose/2]). diff --git a/lib/mnesia/src/mnesia_log.erl b/lib/mnesia/src/mnesia_log.erl index 00ec4740ee..11b792026e 100644 --- a/lib/mnesia/src/mnesia_log.erl +++ b/lib/mnesia/src/mnesia_log.erl @@ -182,6 +182,8 @@ ]). +-compile({no_auto_import,[error/2]}). + -include("mnesia.hrl"). -import(mnesia_lib, [val/1, dir/1]). -import(mnesia_lib, [exists/1, fatal/2, error/2, dbg_out/2]). diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl index 5bd93d6b9b..b6eda9ad3a 100644 --- a/lib/mnesia/src/mnesia_monitor.erl +++ b/lib/mnesia/src/mnesia_monitor.erl @@ -70,6 +70,8 @@ negotiate_protocol_impl/2 ]). +-compile({no_auto_import,[error/2]}). + -import(mnesia_lib, [dbg_out/2, verbose/2, error/2, fatal/2, set/2]). -include("mnesia.hrl"). diff --git a/lib/mnesia/src/mnesia_recover.erl b/lib/mnesia/src/mnesia_recover.erl index 0ca7bf3f7f..7435b6896a 100644 --- a/lib/mnesia/src/mnesia_recover.erl +++ b/lib/mnesia/src/mnesia_recover.erl @@ -62,6 +62,7 @@ code_change/3 ]). +-compile({no_auto_import,[error/2]}). -include("mnesia.hrl"). -import(mnesia_lib, [set/2, verbose/2, error/2, fatal/2]). diff --git a/lib/mnesia/src/mnesia_subscr.erl b/lib/mnesia/src/mnesia_subscr.erl index 93d4a86f7f..415c69d508 100644 --- a/lib/mnesia/src/mnesia_subscr.erl +++ b/lib/mnesia/src/mnesia_subscr.erl @@ -43,6 +43,8 @@ code_change/3 ]). +-compile({no_auto_import,[error/2]}). + -include("mnesia.hrl"). -import(mnesia_lib, [error/2]). |