diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-07-07 13:07:17 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-07-07 13:07:17 +0100 |
| commit | 7f2f52216203fb6506f70d39df4ff79d8695b38e (patch) | |
| tree | 36c922213d344ec6d681a8c950340b6a4582d874 | |
| parent | 1ab7fa38bcf9dae0056275ed9b77ee14ca633e4f (diff) | |
| parent | 3ea5c8c70fd111854e149e4e477c37a2871fb9e8 (diff) | |
| download | rabbitmq-server-git-7f2f52216203fb6506f70d39df4ff79d8695b38e.tar.gz | |
Merging default into bug 21673
| -rw-r--r-- | src/rabbit_invariable_queue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_invariable_queue.erl b/src/rabbit_invariable_queue.erl index d3f89ab96f..df8adb2e2f 100644 --- a/src/rabbit_invariable_queue.erl +++ b/src/rabbit_invariable_queue.erl @@ -52,7 +52,7 @@ -type(state() :: #iv_state { queue :: queue(), qname :: rabbit_amqqueue:name(), len :: non_neg_integer(), - pending_ack :: dict() + pending_ack :: dict:dictionary() }). -include("rabbit_backing_queue_spec.hrl"). diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index dd85d1e44c..f04df8a042 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -167,7 +167,7 @@ -spec(recursive_delete/1 :: ([file:filename()]) -> rabbit_types:ok_or_error({file:filename(), any()})). --spec(dict_cons/3 :: (any(), any(), dict()) -> dict()). +-spec(dict_cons/3 :: (any(), any(), dict:dictionary()) -> dict:dictionary()). -spec(unlink_and_capture_exit/1 :: (pid()) -> 'ok'). -endif. |