diff options
| author | Niclas Eklund <[email protected]> | 2011-02-14 14:34:00 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-02-14 14:34:00 +0100 |
| commit | d2bb03ce3a6a99f3e3f0abe1f74a355879437c4f (patch) | |
| tree | c851063fc2b3201d3d64a0abe1be90e5222a9975 /lib | |
| parent | 27d6af0ed32a25d7ea1dcd83a4163f8e6ec67844 (diff) | |
| download | otp-d2bb03ce3a6a99f3e3f0abe1f74a355879437c4f.tar.gz otp-d2bb03ce3a6a99f3e3f0abe1f74a355879437c4f.tar.bz2 otp-d2bb03ce3a6a99f3e3f0abe1f74a355879437c4f.zip | |
Updsated macro EFORMAT exit handling.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cosNotification/src/CosNotification_Common.erl | 4 | ||||
| -rw-r--r-- | lib/orber/src/orber.erl | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/cosNotification/src/CosNotification_Common.erl b/lib/cosNotification/src/CosNotification_Common.erl index 1e2d9640aa..bcd241f3a8 100644 --- a/lib/cosNotification/src/CosNotification_Common.erl +++ b/lib/cosNotification/src/CosNotification_Common.erl @@ -947,8 +947,6 @@ validate_event_qos(Wanted, Curr) -> v_e_q_helper(Wanted, Curr, []), []. -%% To avoid dialyzer warnings due to the use of exit/throw. -%%-spec(v_e_q_helper/3 :: (_, _, _) -> no_return()). v_e_q_helper([], _Curr, []) -> %% Parsed all and foynd no conflicts. ok; @@ -1073,8 +1071,6 @@ v_e_q_helper(What, _, _) -> %% LQS - local representation of QoS. %% Returns : {NewOMGStyleQoS, NewLocalQoS} | #'CosNotification_UnsupportedQoS'{} %%------------------------------------------------------------ -%% To avoid dialyzer warnings due to the use of exit/throw. -%%-spec(set_properties/9 :: (_, _, _, _, _, _, _, _, _) -> no_return()). set_properties([], Curr, channelAdm, _, [], NewQoS,_,_,LAS) -> merge_properties(NewQoS, Curr, LAS); set_properties([], Curr, _, _, [], NewQoS,_,_,LQS) -> diff --git a/lib/orber/src/orber.erl b/lib/orber/src/orber.erl index 9902306161..f0820811f5 100644 --- a/lib/orber/src/orber.erl +++ b/lib/orber/src/orber.erl @@ -95,7 +95,13 @@ -define(DEBUG_LEVEL, 5). -define(FORMAT(_F, _A), lists:flatten(io_lib:format(_F, _A))). --define(EFORMAT(_F, _A), exit(lists:flatten(io_lib:format(_F, _A)))). +-define(EFORMAT(_F, _A), do_exit(lists:flatten(io_lib:format(_F, _A)))). + + +%% To avoid dialyzer warnings due to the use of exit/throw. +-spec(do_exit/1 :: (_) -> no_return()). +do_exit(Reason) -> + exit(Reason). %%----------------------------------------------------------------- @@ -1029,8 +1035,6 @@ remove_node(Node) when is_atom(Node) -> remove_tables(Tables, Node) -> remove_tables(Tables, Node, []). -%% To avoid dialyzer warnings due to the use of exit/throw. --spec(remove_tables/3 :: (_, _, _) -> no_return()). remove_tables([], _, []) -> ok; remove_tables([], Node, Failed) -> ?EFORMAT("orber:remove_node(~p) failed. Unable to remove table(s): ~p", |