summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-04-09 14:02:41 +0000
committeriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-04-09 14:02:41 +0000
commit3e4f0813c894dad6fd2a15424bcf424d2ade5638 (patch)
tree8d8ca2b4fbe844565e1b0881c7eb7d5180639b8e
parenta653b01a1035f7fd9bedf11ed647b72e09c2d16c (diff)
downloadATCD-3e4f0813c894dad6fd2a15424bcf424d2ade5638.tar.gz
Merged revisions 81297 via svnmerge from
https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/TAO ........ r81297 | iliyan | 2008-04-09 09:02:01 -0500 (Wed, 09 Apr 2008) | 1 line ChangeLogTag: Wed Apr 9 14:00:34 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com> ........
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tao/ORB.cpp6
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?