Added dializer fix for new date format.

Conflicts:

	src/ec_date.erl
This commit is contained in:
Ben Kearns 2012-12-19 21:13:31 +00:00 committed by Jordan Wilberding
parent e28130d9f3
commit 5c6af5c7f5

View file

@ -72,8 +72,7 @@ format(Format, Date) ->
parse(Date) ->
do_parse(Date, calendar:universal_time(),[]).
-spec parse(string(),datetime() | now()) -> datetime().
-spec parse(string(),datetime() | now()) -> datetime()|now().
%% @doc parses the datetime from a string
parse(Date, {_,_,_}=Now) ->
do_parse(Date, calendar:now_to_datetime(Now), []);