diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-10-21 12:30:39 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-10-21 12:30:39 +0100 |
| commit | da8babfe18274eae7887161d92631ea9efccf215 (patch) | |
| tree | b415e44d8221437cea363a982733b7c84ab28073 /include | |
| parent | 9a2ec18d5ca5b946d381450cdc5af5df2eb822e0 (diff) | |
| parent | 9b7c7be80103ac00db23574cb22306f8ea76ae69 (diff) | |
| download | rabbitmq-server-git-da8babfe18274eae7887161d92631ea9efccf215.tar.gz | |
Merging default into bug23111
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 6 | ||||
| -rw-r--r-- | include/rabbit_exchange_type_spec.hrl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index f924878d7a..ae672fc908 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -60,8 +60,8 @@ -record(route, {binding, value = const}). -record(reverse_route, {reverse_binding, value = const}). --record(binding, {exchange_name, key, queue_name, args = []}). --record(reverse_binding, {queue_name, key, exchange_name, args = []}). +-record(binding, {source, key, destination, args = []}). +-record(reverse_binding, {destination, key, source, args = []}). -record(listener, {node, protocol, host, port}). @@ -70,7 +70,7 @@ -record(ssl_socket, {tcp, ssl}). -record(delivery, {mandatory, immediate, txn, sender, message}). --record(amqp_error, {name, explanation, method = none}). +-record(amqp_error, {name, explanation = "", method = none}). -record(event, {type, props, timestamp}). diff --git a/include/rabbit_exchange_type_spec.hrl b/include/rabbit_exchange_type_spec.hrl index cecd666b4d..ae326a872d 100644 --- a/include/rabbit_exchange_type_spec.hrl +++ b/include/rabbit_exchange_type_spec.hrl @@ -31,8 +31,8 @@ -ifdef(use_specs). -spec(description/0 :: () -> [{atom(), any()}]). --spec(publish/2 :: (rabbit_types:exchange(), rabbit_types:delivery()) - -> {rabbit_router:routing_result(), [pid()]}). +-spec(route/2 :: (rabbit_types:exchange(), rabbit_types:delivery()) + -> rabbit_router:match_result()). -spec(validate/1 :: (rabbit_types:exchange()) -> 'ok'). -spec(create/1 :: (rabbit_types:exchange()) -> 'ok'). -spec(recover/2 :: (rabbit_types:exchange(), |