summaryrefslogtreecommitdiff
path: root/ace/TSS_T.cpp
diff options
context:
space:
mode:
authoriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-10-22 19:34:18 +0000
committeriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-10-22 19:34:18 +0000
commit402a831c156e15ff96b1aa302e79d5dcd5562516 (patch)
treef73c2efde9210e05a0cb981f0eed516109314e3a /ace/TSS_T.cpp
parentedc3dbd72c133bfebd03021c9b7c0a7633556eed (diff)
downloadATCD-402a831c156e15ff96b1aa302e79d5dcd5562516.tar.gz
ChangeLogTag: Sun Oct 22 19:33:23 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - imported changes
Diffstat (limited to 'ace/TSS_T.cpp')
-rw-r--r--ace/TSS_T.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/ace/TSS_T.cpp b/ace/TSS_T.cpp
index 1157bcbd38d..221b0f656b6 100644
--- a/ace/TSS_T.cpp
+++ b/ace/TSS_T.cpp
@@ -92,7 +92,7 @@ ACE_TSS<TYPE>::cleanup (void *ptr)
}
template <class TYPE> int
-ACE_TSS<TYPE>::ts_init (void)
+ACE_TSS<TYPE>::ts_init (void)
{
// Ensure that we are serialized!
ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->keylock_, 0);
@@ -263,9 +263,6 @@ ACE_TSS<TYPE>::ts_get (void) const
template <class TYPE> TYPE *
ACE_TSS<TYPE>::ts_object (void) const
{
- // Ensure that we are serialized!
- ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->keylock_, 0);
-
if (this->once_ == 0) // Return 0 if we've never been initialized.
return 0;
@@ -312,9 +309,6 @@ ACE_TSS<TYPE>::ts_object (TYPE *new_ts_obj)
return 0;
}
- // Ensure that we are serialized!
- ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->keylock_, 0);
-
TYPE *ts_obj = 0;
#if defined (ACE_HAS_THR_C_DEST)