diff options
| author | Björn Gustavsson <bjorn@erlang.org> | 2015-05-29 10:51:08 +0200 |
|---|---|---|
| committer | Björn Gustavsson <bjorn@erlang.org> | 2015-05-29 10:51:08 +0200 |
| commit | bc3a55ca6581fae7bc0f531979de0e46fd44aff5 (patch) | |
| tree | 4499ee5d722fbb4c2cb4b7041a3470e9a3ee30cf | |
| parent | 6fe0fae81adf2f6a222dccb3222309e205c6ffdc (diff) | |
| parent | 0d7646d6a2d52a75ed694c5114496b880ffb4224 (diff) | |
| download | erlang-bc3a55ca6581fae7bc0f531979de0e46fd44aff5.tar.gz | |
Merge branch 'bjorn/et/eliminate-now-warnings/OTP-12780'
* bjorn/et/eliminate-now-warnings/OTP-12780:
Makefile: no longer tolerate warnings in the et application
et: Eliminate warnings for deprecated erlang:now/0
| -rw-r--r-- | lib/et/src/Makefile | 2 | ||||
| -rw-r--r-- | lib/et/src/et_collector.erl | 2 | ||||
| -rw-r--r-- | lib/et/src/et_selector.erl | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile index 377e593712..b6873371ed 100644 --- a/lib/et/src/Makefile +++ b/lib/et/src/Makefile @@ -65,7 +65,7 @@ APPUP_TARGET = $(EBIN)/$(APPUP_FILE) # ---------------------------------------------------- # FLAGS # ---------------------------------------------------- -ERL_COMPILE_FLAGS += -pa $(ERL_TOP)/lib/et/ebin -I../include +ERL_COMPILE_FLAGS += -pa $(ERL_TOP)/lib/et/ebin -I../include -Werror # ---------------------------------------------------- # Special Build Targets diff --git a/lib/et/src/et_collector.erl b/lib/et/src/et_collector.erl index e05c67be60..1f60dee8ca 100644 --- a/lib/et/src/et_collector.erl +++ b/lib/et/src/et_collector.erl @@ -64,6 +64,8 @@ -export([init/1,terminate/2, code_change/3, handle_call/3, handle_cast/2, handle_info/2]). +-compile([{nowarn_deprecated_function,[{erlang,now,0}]}]). + -include("et_internal.hrl"). -include("../include/et.hrl"). diff --git a/lib/et/src/et_selector.erl b/lib/et/src/et_selector.erl index c8e9c907b2..5497096377 100644 --- a/lib/et/src/et_selector.erl +++ b/lib/et/src/et_selector.erl @@ -28,6 +28,8 @@ parse_event/2 ]). +-compile([{nowarn_deprecated_function,[{erlang,now,0}]}]). + -include("../include/et.hrl"). %%---------------------------------------------------------------------- |