diff options
| author | Jordan Wilberding <[email protected]> | 2014-04-24 12:17:34 +0200 |
|---|---|---|
| committer | Jordan Wilberding <[email protected]> | 2014-04-24 12:17:34 +0200 |
| commit | 95152fbb18cae3ba3cfe2a310b260f2fd06edad0 (patch) | |
| tree | 7b77a3551bceb27b6ac5d37a4f57c843d4e6d7d7 | |
| parent | d7a1d0a1ad735dde857a9d4785301aea83cf38db (diff) | |
| parent | 7fede533d583ec86e0868cdda4b5f4c5333b6697 (diff) | |
| download | relx-95152fbb18cae3ba3cfe2a310b260f2fd06edad0.tar.gz relx-95152fbb18cae3ba3cfe2a310b260f2fd06edad0.tar.bz2 relx-95152fbb18cae3ba3cfe2a310b260f2fd06edad0.zip | |
Merge pull request #166 from tsloughter/master
handle deprecated pre-defined types for 17.0 and later
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | rebar.config | 5 | ||||
| -rw-r--r-- | src/rlx_depsolver.erl | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 764fe9c..0217788 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: erlang otp_release: - - 17.0-rc1 - R16B03-1 - R16B03 - R16B02 diff --git a/rebar.config b/rebar.config index cf03ea3..a250ce9 100644 --- a/rebar.config +++ b/rebar.config @@ -21,7 +21,10 @@ %% Compiler Options ============================================================ {erl_opts, - [debug_info, warnings_as_errors, inline]}. + [{platform_define, "^[0-9]+", namespaced_types}, + debug_info, + warnings_as_errors, + inline]}. %% EUnit ======================================================================= {eunit_opts, diff --git a/src/rlx_depsolver.erl b/src/rlx_depsolver.erl index 20423d0..5d78174 100644 --- a/src/rlx_depsolver.erl +++ b/src/rlx_depsolver.erl @@ -112,7 +112,11 @@ %%============================================================================ %% type %%============================================================================ +-ifdef(namespaced_types). +-type dep_graph() :: gb_tree:tree(). +-else. -type dep_graph() :: gb_tree(). +-endif. -opaque t() :: {?MODULE, dep_graph()}. -type pkg() :: {pkg_name(), vsn()}. -type pkg_name() :: binary() | atom(). |