josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset: 6b66f86b01e4

Browse Source 
Should fix windows compile. Blame me and click (but mostly click)

--HG--
branch : trunk
This commit is contained in:
silinoron
2010-08-15 13:21:05 -07:00
parent e3b8a5923d
commit 4d5296299b
85 changed files with 590 additions and 5265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
externals/ace/TSS_T.inl
Vendored
+5 -66
View File
@@ -1,14 +1,11 @@
// -*- C++ -*-
//
// $Id: TSS_T.inl 91124 2010-07-19 11:54:35Z vzykov $
#include "ace/Thread.h"
#include "ace/Log_Msg.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// $Id: TSS_T.inl 80826 2008-03-04 14:51:23Z wotte $
#if !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)))
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class TYPE> ACE_INLINE
ACE_TSS<TYPE>::ACE_TSS (TYPE *type)
: type_ (type)
@@ -16,7 +13,7 @@ ACE_TSS<TYPE>::ACE_TSS (TYPE *type)
}
template <class TYPE> ACE_INLINE int
ACE_TSS<TYPE>::ts_init (void)
ACE_TSS<TYPE>::ts_init (void)
{
return 0;
}
@@ -40,64 +37,6 @@ ACE_TSS<TYPE>::ts_get (void) const
return this->type_;
}
#else
# if defined (ACE_HAS_THR_C_DEST)
template <class TYPE> ACE_INLINE ACE_TSS_Adapter *
ACE_TSS<TYPE>::ts_value (void) const
{
// Get the tss adapter from thread-specific storage
void *temp = 0;
if (ACE_Thread::getspecific (this->key_, &temp) == -1)
{
return 0; // This should not happen!
}
return static_cast <ACE_TSS_Adapter *> (temp);
}
# else
template <class TYPE> ACE_INLINE TYPE *
ACE_TSS<TYPE>::ts_value (void) const
{
void *temp = 0;
if (ACE_Thread::getspecific (this->key_, &temp) == -1)
{
return 0; // This should not happen!
}
return static_cast <TYPE *> (temp);
}
# endif /* ACE_HAS_THR_C_DEST */
# if defined (ACE_HAS_THR_C_DEST)
template <class TYPE> ACE_INLINE int
ACE_TSS<TYPE>::ts_value (ACE_TSS_Adapter *new_tss_adapter) const
{
if (ACE_Thread::setspecific (this->key_,
(void *) new_tss_adapter) != 0)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("%p\n"),
ACE_TEXT ("ACE_Thread::setspecific() failed!")));
return -1;
}
return 0;
}
# else
template <class TYPE> ACE_INLINE int
ACE_TSS<TYPE>::ts_value (TYPE *new_ts_obj) const
{
if (ACE_Thread::setspecific (this->key_, (void *) new_ts_obj) != 0)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("%p\n"),
ACE_TEXT ("ACE_Thread::setspecific() failed!")));
return -1;
}
return 0;
}
# endif /* ACE_HAS_THR_C_DEST */
ACE_END_VERSIONED_NAMESPACE_DECL
#endif /* ! (defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) */
ACE_END_VERSIONED_NAMESPACE_DECL