aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErland Schönbeck <[email protected]>2015-03-09 11:16:01 +0100
committerRickard Green <[email protected]>2015-03-20 15:28:54 +0100
commitf4a774425a440caa912da71cfb8c0c70df4df69e (patch)
treed58a81e1a978386aadec233df50ca7f628780417
parent1132117b38cfe33e770a0d5b1a782d48667427c4 (diff)
downloadotp-f4a774425a440caa912da71cfb8c0c70df4df69e.tar.gz
otp-f4a774425a440caa912da71cfb8c0c70df4df69e.tar.bz2
otp-f4a774425a440caa912da71cfb8c0c70df4df69e.zip
Suppress deprecated warning on erlang:now/0
-rw-r--r--lib/inets/examples/httpd_load_test/hdlt_random_html.erl1
-rw-r--r--lib/inets/src/ftp/ftp.erl1
-rw-r--r--lib/inets/src/tftp/tftp_logger.erl1
-rw-r--r--lib/inets/src/tftp/tftp_sup.erl1
-rw-r--r--lib/inets/test/ftp_suite_lib.erl1
-rw-r--r--lib/inets/test/httpc_SUITE.erl1
-rw-r--r--lib/inets/test/httpd_time_test.erl1
7 files changed, 7 insertions, 0 deletions
diff --git a/lib/inets/examples/httpd_load_test/hdlt_random_html.erl b/lib/inets/examples/httpd_load_test/hdlt_random_html.erl
index 0024284054..53ec1ea440 100644
--- a/lib/inets/examples/httpd_load_test/hdlt_random_html.erl
+++ b/lib/inets/examples/httpd_load_test/hdlt_random_html.erl
@@ -19,6 +19,7 @@
%%
-module(hdlt_random_html).
+-compile([{nowarn_deprecated_function,{erlang,now,0}}]).
-export([page/3]).
page(SessionID, _Env, Input) ->
diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl
index 20f36e6d8a..66dcf0f167 100644
--- a/lib/inets/src/ftp/ftp.erl
+++ b/lib/inets/src/ftp/ftp.erl
@@ -21,6 +21,7 @@
%% It also supports ipv6 RFC 2428 and starttls RFC 4217.
-module(ftp).
+-compile([{nowarn_deprecated_function,{erlang,now,0}}]).
-behaviour(gen_server).
-behaviour(inets_service).
diff --git a/lib/inets/src/tftp/tftp_logger.erl b/lib/inets/src/tftp/tftp_logger.erl
index aa449682ce..2066445ef7 100644
--- a/lib/inets/src/tftp/tftp_logger.erl
+++ b/lib/inets/src/tftp/tftp_logger.erl
@@ -18,6 +18,7 @@
%%
%%
-module(tftp_logger).
+-compile([{nowarn_deprecated_function,{erlang,now,0}}]).
%%-------------------------------------------------------------------
%% Interface
diff --git a/lib/inets/src/tftp/tftp_sup.erl b/lib/inets/src/tftp/tftp_sup.erl
index 54806bd432..9327cc93b6 100644
--- a/lib/inets/src/tftp/tftp_sup.erl
+++ b/lib/inets/src/tftp/tftp_sup.erl
@@ -22,6 +22,7 @@
%%----------------------------------------------------------------------
-module(tftp_sup).
+-compile([{nowarn_deprecated_function,{erlang,now,0}}]).
-behaviour(supervisor).
diff --git a/lib/inets/test/ftp_suite_lib.erl b/lib/inets/test/ftp_suite_lib.erl
index 292a4399cd..42e2190758 100644
--- a/lib/inets/test/ftp_suite_lib.erl
+++ b/lib/inets/test/ftp_suite_lib.erl
@@ -29,6 +29,7 @@
% -export([init_per_testcase/2, end_per_testcase/2]).
-compile(export_all).
+-compile([{nowarn_deprecated_function,{erlang,now,0}}]).
-record(progress, {
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 495d129661..6569027553 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -30,6 +30,7 @@
-include("http_internal.hrl").
%% Note: This directive should only be used in test suites.
-compile(export_all).
+-compile([{nowarn_deprecated_function,{erlang,now,0}}]).
-define(URL_START, "http://").
-define(TLS_URL_START, "https://").
diff --git a/lib/inets/test/httpd_time_test.erl b/lib/inets/test/httpd_time_test.erl
index 0c27f47aa9..43bafe5714 100644
--- a/lib/inets/test/httpd_time_test.erl
+++ b/lib/inets/test/httpd_time_test.erl
@@ -18,6 +18,7 @@
%%
%%
-module(httpd_time_test).
+-compile([{nowarn_deprecated_function,{erlang,now,0}}]).
-export([t/3, t1/2, t2/2, t4/2]).