diff options
| author | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-09 14:02:01 +0000 |
|---|---|---|
| committer | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-09 14:02:01 +0000 |
| commit | 5508931ab87dd6011cf4e65d76f72a6a68fd48e9 (patch) | |
| tree | 9626a8ccba4ffb53af3b2f152db98dcc305f9323 | |
| parent | a4761fdcf589220be0d7f29799f186716f5e8236 (diff) | |
| download | ATCD-5508931ab87dd6011cf4e65d76f72a6a68fd48e9.tar.gz | |
ChangeLogTag: Wed Apr 9 14:00:34 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e63af2f20fa..21531769000 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Apr 9 14:00:34 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com> + + * tao/ORB.cpp: + + Fixing a complaint about the use of a implicit temporary with + operator=(). + Tue Apr 8 12:58:34 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com> * tao/TAO_Internal.cpp: diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 664e07a98e4..b25ddc05d55 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1111,7 +1111,7 @@ namespace TAO return found; } - ACE_Service_Gestalt_Auto_Ptr + ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> find_orb_context (const ACE_CString& orbconfig_string) { const ACE_TCHAR *arg = ACE_TEXT_CHAR_TO_TCHAR(orbconfig_string.c_str ()); @@ -1121,7 +1121,7 @@ namespace TAO const ACE_TCHAR *local = ACE_TEXT("LOCAL"); if (ACE_OS::strcasecmp (arg, local) == 0) { - ACE_Service_Gestalt_Auto_Ptr gestalt; + ACE_Service_Gestalt* gestalt = 0; ACE_NEW_THROW_EX (gestalt, ACE_Service_Gestalt (ACE_Service_Gestalt::MAX_SERVICES / 4, true), @@ -1129,7 +1129,7 @@ namespace TAO (CORBA::SystemException::_tao_minor_code (0, ENOMEM), CORBA::COMPLETED_NO)); - return gestalt; + return ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> (gestalt); } // Explicit global case? |