[10643] Update the ACE part we use to 5.8.2

Signed-off-by: Neo2003 <Neo.2003@Hotmail.fr>
This commit is contained in:
Neo2003 2010-10-25 20:36:51 +02:00
parent 8f71d95c0d
commit 23c920ca4b
739 changed files with 22031 additions and 40373 deletions

View file

@ -1,3 +1,5 @@
// $Id: SV_Semaphore_Simple.cpp 91287 2010-08-05 10:30:49Z johnnyw $
#include "ace/SV_Semaphore_Simple.h"
#include "ace/Log_Msg.h"
#include "ace/ACE.h"
@ -7,10 +9,6 @@
#include "ace/SV_Semaphore_Simple.inl"
#endif /* !__ACE_INLINE__ */
ACE_RCSID (ace,
SV_Semaphore_Simple,
"$Id: SV_Semaphore_Simple.cpp 82559 2008-08-07 20:23:07Z parsons $")
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE (ACE_SV_Semaphore_Simple)
@ -138,15 +136,15 @@ ACE_SV_Semaphore_Simple::name_2_key (const char *name)
// Basically "hash" the values in the <name>. This won't
// necessarily guarantee uniqueness of all keys.
// But (IMHO) CRC32 is good enough for most purposes (Carlos)
#if defined (ACE_WIN64) || defined (ACE_WIN32)
#if defined (ACE_WIN32) && defined (_MSC_VER)
// The cast below is legit...
# pragma warning(push)
# pragma warning(disable : 4312)
#endif /* ACE_WIN64 */
#endif /* defined (ACE_WIN32) && defined (_MSC_VER) */
return (key_t) ACE::crc32 (name);
#if defined (ACE_WIN64) || defined (ACE_WIN32)
#if defined (ACE_WIN32) && defined (_MSC_VER)
# pragma warning(pop)
#endif /* ACE_WIN64 */
#endif /* defined (ACE_WIN32) && defined (_MSC_VER) */
}
// Open or create a ACE_SV_Semaphore. We return 1 if all is OK, else