diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-10-18 16:10:10 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-10-18 16:10:10 +0100 |
| commit | 1a60d0e0186d385607ca34fe3e400cdc5ac3a3e2 (patch) | |
| tree | 169f49cecbaa6012eba1a56a189cb6894819311d /include | |
| parent | ce51b66fca22a4a2d7bcf2cb3a6d7f40b3b21e92 (diff) | |
| parent | 1d554294023459a2b80fe8cac5ba69b90be35e0c (diff) | |
| download | rabbitmq-server-git-1a60d0e0186d385607ca34fe3e400cdc5ac3a3e2.tar.gz | |
merge default into bug23319
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 4 | ||||
| -rw-r--r-- | include/rabbit_exchange_type_spec.hrl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 7661e34ce2..28e3925d61 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}). 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(), |