summaryrefslogtreecommitdiff
path: root/ace/Local_Tokens.cpp
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1996-10-27 21:44:14 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1996-10-27 21:44:14 +0000
commit0cc5504a5c8a958101a09accb21c135281d5e9ff (patch)
treea38b7d21b5f25b5ef5548a423339c747f056059c /ace/Local_Tokens.cpp
parent997479406012dab3e5e787d3a724bf5f2fd2b04c (diff)
downloadATCD-0cc5504a5c8a958101a09accb21c135281d5e9ff.tar.gz
Jamming!
Diffstat (limited to 'ace/Local_Tokens.cpp')
-rw-r--r--ace/Local_Tokens.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index 0c8f12b0eae..f928de4c6a0 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -97,10 +97,10 @@ ACE_TPQ_Entry::ACE_TPQ_Entry (const ACE_Token_Proxy *new_proxy,
}
ACE_TPQ_Entry::ACE_TPQ_Entry (void)
- : proxy_ (0),
+ : cond_var_ (lock_),
+ proxy_ (0),
nesting_level_ (0),
- sleep_hook_ (0),
- cond_var_ (lock_)
+ sleep_hook_ (0)
{
ACE_TRACE ("ACE_TPQ_Entry::ACE_TPQ_Entry null const.");
}
@@ -1081,9 +1081,10 @@ ACE_Token_Proxy::ACE_Token_Proxy (void)
// Notice the token_ (0). Do *not* copy the token pointer. This must
// be obtained through the token manager. Also, we don't copy any
// waiter info. A copied Proxy does *not* inherit client_id.
-ACE_Token_Proxy::ACE_Token_Proxy (const ACE_Token_Proxy &p)
-: token_ (0),
- waiter_ (this, 0)
+
+ACE_Token_Proxy::ACE_Token_Proxy (const ACE_Token_Proxy &)
+ : token_ (0),
+ waiter_ (this, 0)
{
ACE_TRACE ("ACE_Token_Proxy::ACE_Token_Proxy");
}
@@ -1309,9 +1310,10 @@ ACE_Token_Proxy::handle_options (ACE_Synch_Options &options,
}
int
-ACE_Token_Proxy::release (ACE_Synch_Options &options)
+ACE_Token_Proxy::release (ACE_Synch_Options &)
{
ACE_TRACE ("ACE_Token_Proxy::release");
+
if (this->token_ == 0)
{
errno = ENOENT;