diff options
| author | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-03-21 21:42:05 +0000 |
|---|---|---|
| committer | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-03-21 21:42:05 +0000 |
| commit | a5f0317ac836e36a5ba60328d294c06a97584fb3 (patch) | |
| tree | 93c88a06dc2926cbb9b1948b0ed89937bbb131bd | |
| parent | cce31c7cdc7bad592f73d9e51d6af30c0450fc46 (diff) | |
| download | ATCD-a5f0317ac836e36a5ba60328d294c06a97584fb3.tar.gz | |
Merged revisions 81044-81045,81053-81054 via svnmerge from
https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/TAO
........
r81044 | johnnyw | 2008-03-21 02:27:56 -0500 (Fri, 21 Mar 2008) | 1 line
........
r81045 | johnnyw | 2008-03-21 02:28:47 -0500 (Fri, 21 Mar 2008) | 1 line
........
r81053 | johnnyw | 2008-03-21 10:42:18 -0500 (Fri, 21 Mar 2008) | 1 line
Fri Mar 21 15:41:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
........
r81054 | johnnyw | 2008-03-21 10:44:49 -0500 (Fri, 21 Mar 2008) | 1 line
Fri Mar 21 15:43:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
........
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/tests/Bug_3251_Regression/server.cpp | 2 | ||||
| -rw-r--r-- | TAO/utils/nslist/nsdel.cpp | 2 | ||||
| -rw-r--r-- | TAO/utils/nslist/nslist.cpp | 3 |
4 files changed, 15 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index bbc4b0e94c8..8ff6105f63c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Fri Mar 21 15:43:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_3251_Regression/server.cpp: + Fixed warnings in vxworks build + +Fri Mar 21 15:41:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * utils/nslist/nslist.cpp: + * utils/nslist/nsdel.cpp: + Added missign duplicate calls + Thu Mar 20 18:29:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * utils/nslist/nslist.cpp: diff --git a/TAO/tests/Bug_3251_Regression/server.cpp b/TAO/tests/Bug_3251_Regression/server.cpp index 92b0a1185f1..94ded03c24b 100644 --- a/TAO/tests/Bug_3251_Regression/server.cpp +++ b/TAO/tests/Bug_3251_Regression/server.cpp @@ -7,12 +7,14 @@ #include "ace/Service_Config.h" #include "ace/Log_Msg.h" +#if !defined (ACE_LACKS_FORK) static volatile bool bShutdown = false; static void shutdown_func(int) { ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%P|%t) Shutdown requested\n"))); bShutdown = true; } +#endif int ACE_TMAIN(int, ACE_TCHAR ** argv) diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp index 4cd1a8d8f0a..b1918c26a22 100644 --- a/TAO/utils/nslist/nsdel.cpp +++ b/TAO/utils/nslist/nsdel.cpp @@ -58,7 +58,7 @@ namespace ACE_DEBUG ((LM_DEBUG, "RTT not supported in TAO build.\n")); #endif } - return obj; + return CORBA::Object::_duplicate(obj); } } // end of local unnamed namespace diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp index 3a0ab49b5d4..0ad6394f692 100644 --- a/TAO/utils/nslist/nslist.cpp +++ b/TAO/utils/nslist/nslist.cpp @@ -336,7 +336,6 @@ namespace TimeBase::TimeT roundTripTimeoutVal; ORBSVCS_Time::Time_Value_to_TimeT(roundTripTimeoutVal, rtt); - CORBA::Any anyObjectVal; anyObjectVal <<= roundTripTimeoutVal; CORBA::PolicyList polList (1); @@ -352,7 +351,7 @@ namespace ACE_DEBUG ((LM_DEBUG, "RTT not supported in TAO build.\n")); #endif } - return obj; + return CORBA::Object::_duplicate(obj); } } // end of local unnamed namespace |