summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Mazzoli <francesco@rabbitmq.com>2012-05-01 16:06:09 +0100
committerFrancesco Mazzoli <francesco@rabbitmq.com>2012-05-01 16:06:09 +0100
commit2ddeee16341cd53a06c0a3f74ac20346558f0655 (patch)
tree0781e0b06594a7002f721e93175eb285aae75465
parentcafaa1943a0e20b010449a1908c459f76b848107 (diff)
parent100f1750179a57193eed57b2ca454d352a630b74 (diff)
downloadrabbitmq-server-2ddeee16341cd53a06c0a3f74ac20346558f0655.tar.gz
merge default
-rw-r--r--src/rabbit_variable_queue.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 209e5252..49892eb3 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -323,7 +323,6 @@
-type(timestamp() :: {non_neg_integer(), non_neg_integer(), non_neg_integer()}).
-type(seq_id() :: non_neg_integer()).
--type(ack() :: seq_id()).
-type(rates() :: #rates { egress :: {timestamp(), non_neg_integer()},
ingress :: {timestamp(), non_neg_integer()},
@@ -335,6 +334,10 @@
count :: non_neg_integer(),
end_seq_id :: non_neg_integer() }).
+%% The compiler (rightfully) complains that ack() and state() are unused. The
+%% problem here is that we can't parametrise the BQ behaviour by these two types
+%% as we would like to. We still leave these here for documentation purposes.
+-type(ack() :: seq_id()).
-type(state() :: #vqstate {
q1 :: ?QUEUE:?QUEUE(),
q2 :: ?QUEUE:?QUEUE(),