diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-04-26 09:20:04 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-04-26 09:20:04 +0000 |
| commit | 4c3a71b3050304123cb64375d69e4aa17195894c (patch) | |
| tree | 0d62eaae8ab4caf59d04896d0fdda5284fd83e1f /TAO/tao/TAO_Singleton.cpp | |
| parent | 6104fd34e708e0a8a37a949d98b102eba119ddfd (diff) | |
| download | ATCD-4c3a71b3050304123cb64375d69e4aa17195894c.tar.gz | |
Tue Apr 26 09:00:31 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/tao_orb_tests.lst:
Disabled some tests with CORBA/e micro
* tao/Connection_Handler.cpp:
* tao/Resume_Handle_Deferred.h:
* tao/Resume_Handle_Deferred.cpp:
Use reference counting for deletion, also log an error and return -1
when schedule_timer fails, we have a critical error at that moment
* tao/Policy_Validator.cpp:
* tao/TAO_Singleton.cpp:
* tao/Leader_Follower.cpp:
Use %@ for logging pointers
Diffstat (limited to 'TAO/tao/TAO_Singleton.cpp')
| -rw-r--r-- | TAO/tao/TAO_Singleton.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/TAO/tao/TAO_Singleton.cpp b/TAO/tao/TAO_Singleton.cpp index 53a926922d4..700087892bd 100644 --- a/TAO/tao/TAO_Singleton.cpp +++ b/TAO/tao/TAO_Singleton.cpp @@ -31,7 +31,7 @@ TAO_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("TAO_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %@"), TAO_Singleton<TYPE, ACE_LOCK>::instance_i ())); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ @@ -128,7 +128,7 @@ TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %@"), TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ())); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ |