aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/agent/snmp_standard_mib.erl
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/snmp/src/agent/snmp_standard_mib.erl
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/snmp/src/agent/snmp_standard_mib.erl')
-rw-r--r--lib/snmp/src/agent/snmp_standard_mib.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/snmp/src/agent/snmp_standard_mib.erl b/lib/snmp/src/agent/snmp_standard_mib.erl
index 3928a8afe6..639172401d 100644
--- a/lib/snmp/src/agent/snmp_standard_mib.erl
+++ b/lib/snmp/src/agent/snmp_standard_mib.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -33,6 +33,8 @@
-define(disabled, 2).
%% External exports
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
-export([configure/1, reconfigure/1, reset/0, sys_up_time/0, sys_up_time/1,
snmp_enable_authen_traps/1, snmp_enable_authen_traps/2,
sys_object_id/1, sys_object_id/2, sys_or_table/3,