diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-05-15 18:23:04 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-05-15 18:23:04 +0000 |
commit | 38d791f18d8a67b8b9319f4b6a9579101628b28c (patch) | |
tree | be35c69512246f58a303abc27e2028a848a78f8a /ACE/ace/Log_Msg.cpp | |
parent | 7d6ea0dc00c882c452db06f31af9acc17fc18046 (diff) | |
download | ATCD-38d791f18d8a67b8b9319f4b6a9579101628b28c.tar.gz |
Tue May 15 18:16:09 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/ACE.inl:
* ace/Atomic_Op_T.h:
* ace/Basic_Types.h:
* ace/Basic_Types.inl:
* ace/Basic_Types.cpp:
* ace/CDR_Base.h:
* ace/Functor.h:
* ace/Functor.inl:
* ace/Handle_Set.cpp:
* ace/High_Res_Timer.cpp:
* ace/Log_Msg.cpp:
* ace/Numeric_Limits.h:
* ace/OS_NS_Thread.inl:
* ace/OS_NS_Thread.cpp:
* ace/OS_NS_stdlib.inl:
* ace/OS_NS_sys_select.inl:
* ace/OS_NS_sys_wait.inl:
* ace/OS_NS_time.h:
* ace/OS_NS_time.inl:
* ace/OS_NS_unistd.inl:
* ace/Profile_Timer.cpp:
* ace/Sched_Params.cpp:
* ace/Stats.cpp:
* ace/Task.cpp:
* ace/Throughput_Stats.cpp:
* ace/Time_Value.h:
* ace/Time_Value.inl:
* ace/Truncate.h:
* ace/UUID.cpp:
* ace/os_include/os_pthread.h:
* performance-tests/Server_Concurrency/Latency_Stats.h:
* performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp:
* performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp:
* performance-tests/UDP/udp_test.cpp:
* tests/Atomic_Op_Test.cpp:
* tests/Basic_Types_Test.cpp:
* tests/CDR_Array_Test.cpp:
Removed support for Tandem NSK. That was the last platform that
needed the emulated versions of ACE_INT64 and ACE_UINT64, that
emulation has now been removed
* ace/config-tandem-nsk-mips-v2.h:
* ace/config-tandem-nsk-mips-v3.h:
Removed these files.
Diffstat (limited to 'ACE/ace/Log_Msg.cpp')
-rw-r--r-- | ACE/ace/Log_Msg.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 72499eccb0d..080b6e6c7ea 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -1730,15 +1730,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_hthread_t t_id; ACE_OS::thr_self (t_id); -# if defined (ACE_TANDEM_T1248_PTHREADS) - // tandem pthread_t is a struct... yuck. So use the ACE 5.0 - // code for it. - ACE_OS::strcpy (fp, ACE_TEXT ("u")); - if (can_check) - this_len = ACE_OS::snprintf (bp, bspace, format, t_id); - else - this_len = ACE_OS::sprintf (bp, format, t_id); -# else // Yes, this is an ugly C-style cast, but the correct // C++ cast is different depending on whether the t_id // is an integral type or a pointer type. FreeBSD uses @@ -1751,7 +1742,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, else this_len = ACE_OS::sprintf (bp, format, (unsigned long)t_id); -# endif /* ACE_TANDEM_T1248_PTHREADS */ #endif /* ACE_WIN32 */ ACE_UPDATE_COUNT (bspace, this_len); @@ -1978,21 +1968,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, break; case 'Q': -#if defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T) - { - // This relies on the ACE_U_LongLong storage layout. - ACE_UINT32 hi = va_arg (argp, ACE_UINT32); - ACE_UINT32 lo = va_arg (argp, ACE_UINT32); - if (hi > 0) - this_len = ACE_OS::sprintf (bp, - "0x%lx%0*lx", - hi, - 2 * sizeof lo, - lo); - else - this_len = ACE_OS::sprintf (bp, "0x%lx", lo); - } -#else /* ! ACE_LACKS_LONGLONG_T */ { const ACE_TCHAR *fmt = ACE_UINT64_FORMAT_SPECIFIER; ACE_OS::strcpy (fp, &fmt[1]); // Skip leading % @@ -2005,15 +1980,10 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, format, va_arg (argp, ACE_UINT64)); } -#endif /* ! ACE_LACKS_LONGLONG_T || ACE_LACKS_UNSIGNEDLONGLONG_T */ ACE_UPDATE_COUNT (bspace, this_len); break; case 'q': - #if defined (ACE_LACKS_LONGLONG_T) - // No implementation available yet, no ACE_INT64 emulation - // available yet - #else /* ! ACE_LACKS_LONGLONG_T */ { const ACE_TCHAR *fmt = ACE_INT64_FORMAT_SPECIFIER; ACE_OS::strcpy (fp, &fmt[1]); // Skip leading % @@ -2026,7 +1996,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, format, va_arg (argp, ACE_INT64)); } - #endif /* ! ACE_LACKS_LONGLONG_T */ ACE_UPDATE_COUNT (bspace, this_len); break; |