Skip to content

Commit

Permalink
Modify type names so they don't override built in types
Browse files Browse the repository at this point in the history
  • Loading branch information
howleysv committed Aug 26, 2015
1 parent dda35e1 commit 00d2f86
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions include/emysql.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
port :: number(),
database :: string(),
encoding :: utf8 | latin1 | {utf8, utf8_unicode_ci} | {utf8, utf8_general_ci},
available=queue:new() :: emysql:queue(),
locked=gb_trees:empty() :: emysql:gb_tree(),
waiting=queue:new() :: emysql:queue(),
available=queue:new() :: emysql:t_queue(),
locked=gb_trees:empty() :: emysql:t_gb_tree(),
waiting=queue:new() :: emysql:t_queue(),
start_cmds=[] :: string(),
conn_test_period=0 :: number(),
connect_timeout=infinity :: number() | infinity,
Expand Down
20 changes: 10 additions & 10 deletions src/emysql.erl
Original file line number Diff line number Diff line change
Expand Up @@ -137,19 +137,19 @@
-include("emysql.hrl").

-export_type([
gb_tree/0,
queue/0,
dict/0
t_gb_tree/0,
t_queue/0,
t_dict/0
]).

-ifdef(namespaced_types).
-type gb_tree() :: gb_trees:tree().
-type queue() :: queue:queue().
-type dict() :: dict:dict().
-type t_gb_tree() :: gb_trees:tree().
-type t_queue() :: queue:queue().
-type t_dict() :: dict:dict().
-else.
-type gb_tree() :: gb_tree().
-type queue() :: queue().
-type dict() :: dict().
-type t_gb_tree() :: gb_tree().
-type t_queue() :: queue().
-type t_dict() :: dict().
-endif.


Expand Down Expand Up @@ -686,7 +686,7 @@ result_type(#eof_packet{}) -> eof.
-spec as_dict(Result) -> Dict
when
Result :: #result_packet{},
Dict :: emysql:dict().
Dict :: t_dict().
as_dict(Res) -> emysql_conv:as_dict(Res).


Expand Down
2 changes: 1 addition & 1 deletion src/emysql_conn_mgr.erl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

-include("emysql.hrl").

-record(state, {pools, lockers = dict:new() :: emysql:dict()}).
-record(state, {pools, lockers = dict:new() :: emysql:t_dict()}).

%%====================================================================
%% API
Expand Down

0 comments on commit 00d2f86

Please sign in to comment.