diff options
| author | Hans Bolinder <[email protected]> | 2016-01-20 15:08:41 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-01-20 15:08:41 +0100 |
| commit | 8aee2c6f41f7fa7bd4efabd4faf9acca61d12744 (patch) | |
| tree | 64061454eb67610173178813089e243a13afe009 | |
| parent | 72ef104bc85f5fec2e4203314e239dde2ff58e83 (diff) | |
| parent | e5949b5cd2a6d0f691097de189e0f95f34ac404d (diff) | |
| download | otp-8aee2c6f41f7fa7bd4efabd4faf9acca61d12744.tar.gz otp-8aee2c6f41f7fa7bd4efabd4faf9acca61d12744.tar.bz2 otp-8aee2c6f41f7fa7bd4efabd4faf9acca61d12744.zip | |
Merge branch 'hb/stdlib/refine_abstr_types/OTP-10292'
* hb/stdlib/refine_abstr_types/OTP-10292:
tools: Fix a Dialyzer warning
common_test: Fix a Dialyzer warning
| -rw-r--r-- | lib/common_test/src/ct_make.erl | 7 | ||||
| -rw-r--r-- | lib/tools/src/make.erl | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/common_test/src/ct_make.erl b/lib/common_test/src/ct_make.erl index f4b81a0ef6..e7a9cfa843 100644 --- a/lib/common_test/src/ct_make.erl +++ b/lib/common_test/src/ct_make.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2013. All Rights Reserved. +%% Copyright Ericsson AB 2009-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -324,10 +324,11 @@ check_includes(File, IncludePath, ObjMTime) -> end. check_includes2(Epp, File, ObjMTime) -> + A1 = erl_anno:new(1), case epp:parse_erl_form(Epp) of - {ok, {attribute, 1, file, {File, 1}}} -> + {ok, {attribute, A1, file, {File, A1}}} -> check_includes2(Epp, File, ObjMTime); - {ok, {attribute, 1, file, {IncFile, 1}}} -> + {ok, {attribute, A1, file, {IncFile, A1}}} -> case file:read_file_info(IncFile) of {ok, #file_info{mtime=MTime}} when MTime>ObjMTime -> epp:close(Epp), diff --git a/lib/tools/src/make.erl b/lib/tools/src/make.erl index 5d5a1ef2bd..26378f28a0 100644 --- a/lib/tools/src/make.erl +++ b/lib/tools/src/make.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2013. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -299,10 +299,11 @@ check_includes(File, IncludePath, ObjMTime) -> end. check_includes2(Epp, File, ObjMTime) -> + A1 = erl_anno:new(1), case epp:parse_erl_form(Epp) of - {ok, {attribute, 1, file, {File, 1}}} -> + {ok, {attribute, A1, file, {File, A1}}} -> check_includes2(Epp, File, ObjMTime); - {ok, {attribute, 1, file, {IncFile, 1}}} -> + {ok, {attribute, A1, file, {IncFile, A1}}} -> case file:read_file_info(IncFile) of {ok, #file_info{mtime=MTime}} when MTime>ObjMTime -> epp:close(Epp), |