summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2010-06-30 11:56:54 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2010-06-30 11:56:54 +0100
commit8bbcb423fb6f79cce91f29472d745f0b6e986c8c (patch)
treeda4312fdbe4db8fa9418b093dbbd5d2ee5f20612
parentc3a6ed3d284c59b2f313e31b5f7d8a4d9c6dc1ef (diff)
downloadrabbitmq-server-git-8bbcb423fb6f79cce91f29472d745f0b6e986c8c.tar.gz
tid() -> ets:tid() == able to compile on R14A
-rw-r--r--src/rabbit_msg_store.erl10
-rw-r--r--src/rabbit_msg_store_gc.erl2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 706a7fae70..60c13372aa 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -112,10 +112,10 @@
index_module :: atom(),
dir :: file_path(),
gc_pid :: pid(),
- file_handles_ets :: tid(),
- file_summary_ets :: tid(),
- dedup_cache_ets :: tid(),
- cur_file_cache_ets :: tid() }).
+ file_handles_ets :: ets:tid(),
+ file_summary_ets :: ets:tid(),
+ dedup_cache_ets :: ets:tid(),
+ cur_file_cache_ets :: ets:tid() }).
-type(startup_fun_state() ::
{(fun ((A) -> 'finished' | {guid(), non_neg_integer(), A})), A}).
@@ -140,7 +140,7 @@
-spec(successfully_recovered_state/1 :: (server()) -> boolean()).
-spec(gc/3 :: (non_neg_integer(), non_neg_integer(),
- {tid(), file_path(), atom(), any()}) ->
+ {ets:tid(), file_path(), atom(), any()}) ->
'concurrent_readers' | non_neg_integer()).
-endif.
diff --git a/src/rabbit_msg_store_gc.erl b/src/rabbit_msg_store_gc.erl
index 4b80d088d7..a02d137523 100644
--- a/src/rabbit_msg_store_gc.erl
+++ b/src/rabbit_msg_store_gc.erl
@@ -55,7 +55,7 @@
-ifdef(use_specs).
--spec(start_link/4 :: (file_path(), any(), atom(), tid()) ->
+-spec(start_link/4 :: (file_path(), any(), atom(), ets:tid()) ->
{'ok', pid()} | 'ignore' | {'error', any()}).
-spec(gc/3 :: (pid(), non_neg_integer(), non_neg_integer()) -> 'ok').
-spec(no_readers/2 :: (pid(), non_neg_integer()) -> 'ok').