diff --git a/rebar.config b/rebar.config index dcdc11e..aecc6a1 100644 --- a/rebar.config +++ b/rebar.config @@ -9,8 +9,7 @@ %% Compiler Options ============================================================ {erl_opts, - [{platform_define, "^[0-9]+", namespaced_types}, - {platform_define, "^2", unicode_str}, + [{platform_define, "^2", unicode_str}, {platform_define, "^(R|1|20)", fun_stacktrace}, debug_info, warnings_as_errors]}. diff --git a/src/ec_dict.erl b/src/ec_dict.erl index 0c0b998..3e9418e 100644 --- a/src/ec_dict.erl +++ b/src/ec_dict.erl @@ -34,11 +34,7 @@ %%%=================================================================== %% This should be opaque, but that kills dialyzer so for now we export it %% however you should not rely on the internal representation here --ifdef(namespaced_types). -type dictionary(_K, _V) :: dict:dict(). --else. --type dictionary(_K, _V) :: dict(). --endif. %%%=================================================================== %%% API diff --git a/src/ec_plists.erl b/src/ec_plists.erl index 846049d..cd9b915 100644 --- a/src/ec_plists.erl +++ b/src/ec_plists.erl @@ -480,16 +480,9 @@ usort(Fun, List, Malt) -> runmany(Fun2, {recursive, Fuse}, List, Malt). %% @doc Like below, assumes default MapMalt of 1. --ifdef(namespaced_types). -spec mapreduce(MapFunc, list()) -> dict:dict() when MapFunc :: fun((term()) -> DeepListOfKeyValuePairs), DeepListOfKeyValuePairs :: [DeepListOfKeyValuePairs] | {Key::term(), Value::term()}. --else. --spec mapreduce(MapFunc, list()) -> dict() when - MapFunc :: fun((term()) -> DeepListOfKeyValuePairs), - DeepListOfKeyValuePairs :: [DeepListOfKeyValuePairs] | {Key::term(), Value::term()}. --endif. - mapreduce(MapFunc, List) -> mapreduce(MapFunc, List, 1). @@ -518,17 +511,10 @@ mapreduce(MapFunc, List, MapMalt) -> %% %% mapreduce requires OTP R11B, or it may leave monitoring messages in the %% message queue. --ifdef(namespaced_types). -spec mapreduce(MapFunc, list(), InitState::term(), ReduceFunc, malt()) -> dict:dict() when MapFunc :: fun((term()) -> DeepListOfKeyValuePairs), DeepListOfKeyValuePairs :: [DeepListOfKeyValuePairs] | {Key::term(), Value::term()}, ReduceFunc :: fun((OldState::term(), Key::term(), Value::term()) -> NewState::term()). --else. --spec mapreduce(MapFunc, list(), InitState::term(), ReduceFunc, malt()) -> dict() when - MapFunc :: fun((term()) -> DeepListOfKeyValuePairs), - DeepListOfKeyValuePairs :: [DeepListOfKeyValuePairs] | {Key::term(), Value::term()}, - ReduceFunc :: fun((OldState::term(), Key::term(), Value::term()) -> NewState::term()). --endif. mapreduce(MapFunc, List, InitState, ReduceFunc, MapMalt) -> Parent = self(), {Reducer, ReducerRef} =