Merged revisions 81105,81108-81109,81113 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/TAO ........ r81105 | mitza | 2008-03-26 17:36:45 -0500 (Wed, 26 Mar 2008) | 1 line ChangeLogTag: Wed Mar 26 22:35:31 UTC 2008 Adam Mitz <mitza@ociweb.com> ........ r81108 | elliott_c | 2008-03-27 06:51:13 -0500 (Thu, 27 Mar 2008) | 1 line ChangeLogTag: Thu Mar 27 11:50:03 UTC 2008 Chad Elliott <elliott_c@ociweb.com> ........ r81109 | elliott_c | 2008-03-27 07:04:00 -0500 (Thu, 27 Mar 2008) | 1 line ChangeLogTag: Thu Mar 27 12:02:29 UTC 2008 Chad Elliott <elliott_c@ociweb.com> ........ r81113 | elliott_c | 2008-03-27 08:15:58 -0500 (Thu, 27 Mar 2008) | 1 line ChangeLogTag: Thu Mar 27 13:15:39 UTC 2008 Chad Elliott <elliott_c@ociweb.com> ........
author: iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2008-03-27 13:55:59 +0000
committer: iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2008-03-27 13:55:59 +0000
commit: 439bdfdc65fb513fc6d60068d6816904d3b988f7 (patch)
tree: 63fca5a8f378543317ec068537f644f0005412d5
parent: 116b8b6cdfaace9e7ca197f663d91c9efccb71d5 (diff)
download: ATCD-439bdfdc65fb513fc6d60068d6816904d3b988f7.tar.gz
7 files changed, 134 insertions, 123 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7bc2a819dd0..72ebf4b3ffd 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,31 @@
+Thu Mar 27 13:15:39 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/diffs/Object_Key.diff:
+
+          Fixed this malformed patch.
+
+Thu Mar 27 12:02:29 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp:
+        * tests/Bug_3251_Regression/DllOrb.cpp:
+
+          Use ACE_auto_ptr_reset() instead of directly assigning to an
+          auto_ptr.  This doesn't work for VxWorks 6.4 (gcc 3.4.4).
+
+Thu Mar 27 11:50:03 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
+
+          Removed build waring from gcc on Solaris.
+
+Wed Mar 26 22:35:31 UTC 2008  Adam Mitz  <mitza@ociweb.com>
+
+        * docs/ORBEndpoint.html:
+        * tao/ORB_Core.h:
+
+          Removed references to ORBListenEndpoint (singular) from comments and
+          HTML documentation.  The option is called ORBListenEndpoints (plural).
+
 Tue Mar 25 18:01:58 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
 
         * tests/CDR/allocator.cpp:
diff --git a/TAO/docs/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html
index afe5772ed93..0c5614d7457 100644
--- a/TAO/docs/ORBEndpoint.html
+++ b/TAO/docs/ORBEndpoint.html
@@ -4,12 +4,12 @@
 
 <html>
   <head>
-    <title>-ORBListenEndpoint Details</title>
+    <title>-ORBListenEndpoints Details</title>
     <!-- Changed by: , 12-Jun-2002 -->
   </head>
 
   <body text = "#000000" link="#000fff" vlink="#ff0f0f" bgcolor="#ffffff">
-    <h1><A HREF="Options.html#-ORBListenEndpoint">-ORBListenEndpoint</A> Details</h1>
+    <h1><A HREF="Options.html#-ORBListenEndpoints">-ORBListenEndpoints</A> Details</h1>
     <P>
     <UL>
       <LI><A HREF="#Overview">Overview</A></LI>
@@ -35,14 +35,14 @@
         iiop://<I><EM>hostname</EM></I>:<I><EM>port</EM></I>
       </CODE></blockquote>
     Sets of endpoints may be specified using multiple
-    <CODE>-ORBListenEndpoint</CODE> options or by delimiting endpoints with
+    <CODE>-ORBListenEndpoints</CODE> options or by delimiting endpoints with
     a semi-colon (;).  For example:
     <blockquote><CODE>
-        -ORBListenEndpoint iiop://localhost:9999 -ORBListenEndpoint uiop:///tmp/mylocalsock -ORBListenEndpoint shmiop://10002
+        -ORBListenEndpoints iiop://localhost:9999 -ORBListenEndpoints uiop:///tmp/mylocalsock -ORBListenEndpoints shmiop://10002
       </CODE></blockquote>
     is equivalent to:
     <blockquote><CODE>
-        -ORBListenEndpoint 'iiop://localhost:9999;uiop:///tmp/mylocalsock;shmiop://10002'
+        -ORBListenEndpoints 'iiop://localhost:9999;uiop:///tmp/mylocalsock;shmiop://10002'
       </CODE></blockquote>
     Notice the single quotes (') in the latter option specification.
     Single quotes are needed to prevent the shell from interpreting
@@ -51,7 +51,7 @@
       If an endpoint is specified without an <CODE>addr</CODE> such as
       the following:
     <blockquote><CODE>
-        -ORBListenEndpoint uiop:// -ORBListenEndpoint shmiop://
+        -ORBListenEndpoints uiop:// -ORBListenEndpoints shmiop://
       </CODE></blockquote>
     then a default endpoint will be created for the specified protocol.
     <P>
@@ -61,14 +61,14 @@
     <P>
     <h2><A NAME="Options">Endpoint-Specific Options</A></h2>
     <P>
-      The <CODE>-ORBListenEndpoint</CODE> options can accept
+      The <CODE>-ORBListenEndpoints</CODE> options can accept
       endpoint-specific options.  Specifically, such options will only
       apply to the endpoint for which they were specified.
     <P>
       An endpoint-specific option is used as follows:
     <BLOCKQUOTE>
       <CODE>
-        -ORBListenEndpoint iiop://foo:1234/option=value
+        -ORBListenEndpoints iiop://foo:1234/option=value
       </CODE>
     </BLOCKQUOTE>
     <P>
@@ -76,7 +76,7 @@
       with an ampersand '<CODE>&amp;</CODE>' as follows:
     <BLOCKQUOTE>
       <CODE>
-        -ORBListenEndpoint 'iiop://foo:1234/option1=value1&option2=value2'
+        -ORBListenEndpoints 'iiop://foo:1234/option1=value1&option2=value2'
       </CODE>
     </BLOCKQUOTE>
     <P>
@@ -102,7 +102,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint iiop://V.v@hostname1:port1,...,W.w@hostname2:port2
+          -ORBListenEndpoints iiop://V.v@hostname1:port1,...,W.w@hostname2:port2
         </CODE>
     </BLOCKQUOTE>
     <P>
@@ -119,7 +119,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint iiop://hostname:port/foobar=50
+          -ORBListenEndpoints iiop://hostname:port/foobar=50
         </CODE>
     </BLOCKQUOTE>
     <P>
@@ -144,14 +144,14 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint iiop://foo2
+          -ORBListenEndpoints iiop://foo2
         </CODE>
     </BLOCKQUOTE>
     or:
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint iiop://foo2.bar.baz
+          -ORBListenEndpoints iiop://foo2.bar.baz
         </CODE>
     </BLOCKQUOTE>
     <P>
@@ -167,7 +167,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint iiop://foo2:1234
+          -ORBListenEndpoints iiop://foo2:1234
         </CODE>
     </BLOCKQUOTE>
     <P>
@@ -184,7 +184,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint iiop://foo2:my_protocol
+          -ORBListenEndpoints iiop://foo2:my_protocol
         </CODE>
     </BLOCKQUOTE>
     <P>
@@ -201,7 +201,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint iiop://
+          -ORBListenEndpoints iiop://
         </CODE>
     </BLOCKQUOTE>
     <P>
@@ -221,7 +221,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint iiop://:1234
+          -ORBListenEndpoints iiop://:1234
         </CODE>
     </BLOCKQUOTE>
     <P>
@@ -240,7 +240,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint iiop://192.168.10.24:1234
+          -ORBListenEndpoints iiop://192.168.10.24:1234
         </CODE>
     </BLOCKQUOTE>
 
@@ -253,8 +253,8 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint iiop://[01ef::1]:123
-          -ORBListenEndpoint iiop://[01ef::1:123]
+          -ORBListenEndpoints iiop://[01ef::1]:123
+          -ORBListenEndpoints iiop://[01ef::1:123]
         </CODE>
     </BLOCKQUOTE>
 
@@ -265,7 +265,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint iiop://1.1@[01ef::1]:123 <B><FONT color='RED'>--> ILLEGAL</FONT></B>
+          -ORBListenEndpoints iiop://1.1@[01ef::1]:123 <B><FONT color='RED'>--> ILLEGAL</FONT></B>
         </CODE>
     </BLOCKQUOTE>
     <P>
@@ -297,10 +297,10 @@
             ephemeral ports except within a restricted user-defined
             range.
             <P>
-            The format for <CODE>ORBListenEndpoint</CODE> with the
+            The format for <CODE>ORBListenEndpoints</CODE> with the
             <CODE>portspan</CODE> option is:
             <BLOCKQUOTE>
-              <CODE>-ORBListenEndpoint iiop://[</CODE><I>hostname</I><CODE>]:</CODE><I
+              <CODE>-ORBListenEndpoints iiop://[</CODE><I>hostname</I><CODE>]:</CODE><I
 >initialPort</I><CODE>/portspan=</CODE><I>span</I>
             </BLOCKQUOTE>
             where <I>initialPort</I> is the initial port number in the
@@ -334,10 +334,10 @@
             environments where the hostname in use is one whose IP
             address changes dynamically.
             <P>
-            The format for <CODE>ORBListenEndpoint</CODE> with the
+            The format for <CODE>ORBListenEndpoints</CODE> with the
             <CODE>hostname_in_ior</CODE> option is:
             <BLOCKQUOTE>
-              <CODE>-ORBListenEndpoint iiop://[</CODE><I>local_hostname</I><CODE>]:</CODE><I
+              <CODE>-ORBListenEndpoints iiop://[</CODE><I>local_hostname</I><CODE>]:</CODE><I
 >port</I><CODE>/hostname_in_ior=</CODE><I>overridden_hostname</I>
             </BLOCKQUOTE>
             where <I>local_hostname</I> and <I>port</I> are specified
@@ -362,10 +362,10 @@
 	    platforms (e.g. Solaris 5.7 x86 allows programs run as same or different
 	    users to bind to the same port when SO_REUSEADDR is set by all users).
             <P>
-            The format for <CODE>ORBListenEndpoint</CODE> with the
+            The format for <CODE>ORBListenEndpoints</CODE> with the
             <CODE>reuse_addr</CODE> option is:
             <BLOCKQUOTE>
-              <CODE>-ORBListenEndpoint iiop://[</CODE><I>local_hostname</I><CODE>]:</CODE><I
+              <CODE>-ORBListenEndpoints iiop://[</CODE><I>local_hostname</I><CODE>]:</CODE><I
 >port</I><CODE>/reuse_addr=[0|1]</CODE>
             </BLOCKQUOTE>
             </TD>
@@ -377,16 +377,16 @@
     <P>
       Here are some additional examples of IIOP endoints:
     <UL>
-      <LI><CODE>-ORBListenEndpoint iiop://1.0@foo1:0</CODE>
-      <LI><CODE>-ORBListenEndpoint iiop://1.0@foo:0,1.1@bar,baz:3456</CODE>
-      <LI><CODE>-ORBListenEndpoint iiop://1.0@foo:0,1.1@bar,baz:3456/foobar=300</CODE></LI>
-      <LI><CODE>-ORBListenEndpoint iiop:///foobar=2</CODE> <FONT COLOR=RED>(notice three slashes "<CODE>///</CODE>")</FONT>
-      <LI><CODE>-ORBListenEndpoint iiop://:2020/foobar=12345</CODE>
-      <LI><CODE>-ORBListenEndpoint iiop://1.1@</CODE>
-      <LI><CODE>-ORBListenEndpoint iiop://1.1@:1234</CODE>
-      <LI><CODE>-ORBListenEndpoint iiop://1.1@,1.0@:1234,1.1@</CODE>
-      <LI><CODE>-ORBListenEndpoint iiop://1.1@foo:2020/portspan=30</CODE>
-      <LI><CODE>-ORBListenEndpoint iiop://foo:2020 -ORBListenEndpoint iiop://foo:10020 </CODE> </CODE>
+      <LI><CODE>-ORBListenEndpoints iiop://1.0@foo1:0</CODE>
+      <LI><CODE>-ORBListenEndpoints iiop://1.0@foo:0,1.1@bar,baz:3456</CODE>
+      <LI><CODE>-ORBListenEndpoints iiop://1.0@foo:0,1.1@bar,baz:3456/foobar=300</CODE></LI>
+      <LI><CODE>-ORBListenEndpoints iiop:///foobar=2</CODE> <FONT COLOR=RED>(notice three slashes "<CODE>///</CODE>")</FONT>
+      <LI><CODE>-ORBListenEndpoints iiop://:2020/foobar=12345</CODE>
+      <LI><CODE>-ORBListenEndpoints iiop://1.1@</CODE>
+      <LI><CODE>-ORBListenEndpoints iiop://1.1@:1234</CODE>
+      <LI><CODE>-ORBListenEndpoints iiop://1.1@,1.0@:1234,1.1@</CODE>
+      <LI><CODE>-ORBListenEndpoints iiop://1.1@foo:2020/portspan=30</CODE>
+      <LI><CODE>-ORBListenEndpoints iiop://foo:2020 -ORBListenEndpoints iiop://foo:10020 </CODE> </CODE>
     </UL>
 
     <hr>
@@ -402,7 +402,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint shmiop://V.v@port1,...,W.w@port2
+          -ORBListenEndpoints shmiop://V.v@port1,...,W.w@port2
         </CODE>
     </BLOCKQUOTE>
     <P>
@@ -429,7 +429,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint shmiop://
+          -ORBListenEndpoints shmiop://
         </CODE>
     </BLOCKQUOTE>
     <P>
@@ -441,14 +441,14 @@
     <P>
       Here are some additional examples of SHMIOP endoints:
     <UL>
-      <LI><CODE>-ORBListenEndpoint shmiop://1.0@0</CODE>
-      <LI><CODE>-ORBListenEndpoint shmiop://1.0@0,3456</CODE>
-      <LI><CODE>-ORBListenEndpoint shmiop://1.0@0,3456/foobar=300</CODE></LI>
-      <LI><CODE>-ORBListenEndpoint shmiop:///foobar=2</CODE> <FONT COLOR=RED>(notice three slashes "<CODE>///</CODE>")</FONT>
-      <LI><CODE>-ORBListenEndpoint shmiop://2020/foobar=12345</CODE>
-      <LI><CODE>-ORBListenEndpoint shmiop://1.1@</CODE>
-      <LI><CODE>-ORBListenEndpoint shmiop://1.1@1234</CODE>
-      <LI><CODE>-ORBListenEndpoint shmiop://1.1@,1.0@1234,1.1@</CODE>
+      <LI><CODE>-ORBListenEndpoints shmiop://1.0@0</CODE>
+      <LI><CODE>-ORBListenEndpoints shmiop://1.0@0,3456</CODE>
+      <LI><CODE>-ORBListenEndpoints shmiop://1.0@0,3456/foobar=300</CODE></LI>
+      <LI><CODE>-ORBListenEndpoints shmiop:///foobar=2</CODE> <FONT COLOR=RED>(notice three slashes "<CODE>///</CODE>")</FONT>
+      <LI><CODE>-ORBListenEndpoints shmiop://2020/foobar=12345</CODE>
+      <LI><CODE>-ORBListenEndpoints shmiop://1.1@</CODE>
+      <LI><CODE>-ORBListenEndpoints shmiop://1.1@1234</CODE>
+      <LI><CODE>-ORBListenEndpoints shmiop://1.1@,1.0@1234,1.1@</CODE>
     </UL><p>
 
     You <font color="red">must specify the hostname</font>, however,
@@ -477,7 +477,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint uiop://V.v@rendezvous_point1,...,W.w@rendezvous_point2
+          -ORBListenEndpoints uiop://V.v@rendezvous_point1,...,W.w@rendezvous_point2
         </CODE>
     </BLOCKQUOTE>
     <P>
@@ -494,7 +494,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint 'uiop://1.0@/tmp/my_rendezvous_point|foobar=50'
+          -ORBListenEndpoints 'uiop://1.0@/tmp/my_rendezvous_point|foobar=50'
         </CODE>
     </BLOCKQUOTE>
     <P>
@@ -518,7 +518,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint uiop:///tmp/foobar
+          -ORBListenEndpoints uiop:///tmp/foobar
         </CODE>
     </BLOCKQUOTE>
     In this example, the optional protocol version and
@@ -529,7 +529,7 @@
       path could be:
     <BLOCKQUOTE>
       <P>
-        <CODE>-ORBListenEndpoint uiop://foobar</CODE> <FONT COLOR=RED>(DISCOURAGED)</FONT>
+        <CODE>-ORBListenEndpoints uiop://foobar</CODE> <FONT COLOR=RED>(DISCOURAGED)</FONT>
     </BLOCKQUOTE>
     <P>
       Again, rendezvous points with relative paths are discouraged
@@ -542,7 +542,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBListenEndpoint uiop://
+          -ORBListenEndpoints uiop://
         </CODE>
     </BLOCKQUOTE>
     <P>
@@ -556,12 +556,12 @@
     <P>
       Here are some additional examples of UIOP endoints:
     <UL>
-      <LI><CODE>-ORBListenEndpoint uiop://1.0@/tmp/foo1</CODE>
-      <LI><CODE>-ORBListenEndpoint uiop://1.0@/tmp/foo,1.1@/home/bar/baz</CODE>
-      <LI><CODE>-ORBListenEndpoint 'uiop://1.1@/tmp/bar|foobar=300'</CODE></LI>
-      <LI><CODE>-ORBListenEndpoint 'uiop://|foobar=2'</CODE>
-      <LI><CODE>-ORBListenEndpoint uiop://1.1@</CODE>
-      <LI><CODE>-ORBListenEndpoint uiop://1.1@,1.0@/tmp/foo,1.1@</CODE>
+      <LI><CODE>-ORBListenEndpoints uiop://1.0@/tmp/foo1</CODE>
+      <LI><CODE>-ORBListenEndpoints uiop://1.0@/tmp/foo,1.1@/home/bar/baz</CODE>
+      <LI><CODE>-ORBListenEndpoints 'uiop://1.1@/tmp/bar|foobar=300'</CODE></LI>
+      <LI><CODE>-ORBListenEndpoints 'uiop://|foobar=2'</CODE>
+      <LI><CODE>-ORBListenEndpoints uiop://1.1@</CODE>
+      <LI><CODE>-ORBListenEndpoints uiop://1.1@,1.0@/tmp/foo,1.1@</CODE>
     </UL>
     <hr>
 
@@ -590,8 +590,8 @@
     <P>
       Here are some additional examples of DIOP endoints:
     <UL>
-      <LI><CODE>-ORBListenEndpoint diop://1.0@foo1:2345</CODE>
-      <LI><CODE>-ORBListenEndpoint diop://1.1@:1234</CODE>
+      <LI><CODE>-ORBListenEndpoints diop://1.0@foo1:2345</CODE>
+      <LI><CODE>-ORBListenEndpoints diop://1.1@:1234</CODE>
     </UL>
 
     <hr>
@@ -619,7 +619,7 @@
       port use the <CODE>ssl_port</CODE> endpoint option:
 
     <UL>
-      <LI><CODE>-ORBListenEndpoint iiop://foo:1234/ssl_port=1235</CODE>
+      <LI><CODE>-ORBListenEndpoints iiop://foo:1234/ssl_port=1235</CODE>
     </UL>
 
     In this case, an <A HREF="#IIOP">IIOP</A> endpoint would be opened
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 52cfc5b1bbe..edda95ea457 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -93,6 +93,8 @@ print_priority_info (const char *const name)
   } else {
     ACE_DEBUG ((LM_DEBUG,"pthread_getschedparam failed: %d\n", status));
   }
+#else
+  ACE_UNUSED_ARG (name);
 #endif /* ACE_HAS_PTHREADS_STD */
 
 #ifdef sun
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
index fd0a49341f3..0f29eb67cee 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
@@ -77,9 +77,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
     return -1;
   }
 
-  ma_barrier_ = auto_ptr < ACE_Thread_Barrier >(
-    new ACE_Thread_Barrier(threadCnt + 1)
-  );
+  ACE_auto_ptr_reset (ma_barrier_, new ACE_Thread_Barrier (threadCnt + 1));
 
   this->activate(
     THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 26ddf0edb83..0d5b4eb1b95 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -954,7 +954,7 @@ protected:
 
   /// Pointer to the list of protocol loaded into this ORB instance.
   /// Helper method to hold the common code part for -ORBEndpoint and
-  /// -ORBListenEndpoint options.
+  /// -ORBListenEndpoints options.
   int set_endpoint_helper (const ACE_CString &lane,
                            const ACE_CString &endpoints);
 
diff --git a/TAO/tao/diffs/Object_Key.diff b/TAO/tao/diffs/Object_Key.diff
index d9625d6efa2..0d05fbf5890 100644
--- a/TAO/tao/diffs/Object_Key.diff
+++ b/TAO/tao/diffs/Object_Key.diff
@@ -1,27 +1,26 @@
---- orig/Object_KeyC.cpp	2005-04-08 10:17:40.978604800 +0200
-+++ Object_KeyC.cpp	2005-04-08 10:17:41.879900800 +0200
-@@ -37,6 +37,10 @@
+--- orig/Object_KeyC.cpp	2008-03-27 08:12:27.000000000 -0500
++++ Object_KeyC.cpp	2008-03-27 08:13:40.000000000 -0500
+@@ -37,6 +37,11 @@
  #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
  #endif /* __BORLANDC__ */
-
+ 
 +#include "ace/ACE.h"
-+#include "ace/Numeric_Limits.h"
 +#include "ace/Truncate.h"
 +#include "ace/OS_NS_string.h"
 +#include "ace/os_include/os_ctype.h"
 +
  // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:69
-
-@@ -88,2 +95,2 @@
+ // be\be_visitor_arg_traits.cpp:70
+ 
+@@ -90,6 +95,159 @@
  TAO::ObjectKey::~ObjectKey (void)
  {}
-
+ 
 +// Hand crafted.
 +
 +void
-+TAO::ObjectKey::encode_sequence_to_string (char * &str,
-+                                           const TAO::unbounded_value_sequence<CORBA::Octet> &seq)
++TAO::ObjectKey::encode_sequence_to_string (char* & str,
++                                           TAO::unbounded_value_sequence<CORBA::Octet> const & seq)
 +{
 +  // We must allocate a buffer which is (gag) 3 times the length
 +  // of the sequence, which is the length required in the worst-case
@@ -32,13 +31,16 @@
 +  // OR, we could just return this space.  The classic time-space tradeoff,
 +  // and for now we'll let time win out, which means that we only do the
 +  // allocation once.
-+  unsigned int const len = 3 * seq.length (); /* space for zero termination not needed */;
++  CORBA::ULong const seq_len = seq.length ();
++  CORBA::ULong const len = 3 * seq_len; /* space for zero termination
++                                           not needed */
 +  str = CORBA::string_alloc (len);
 +
-+  char *cp = str;
++  char * const eos = str + len;
++  char *       cp  = str;
 +
-+  for (unsigned int i = 0;
-+       cp < (str + len) && i < seq.length();
++  for (CORBA::ULong i = 0;
++       cp < eos && i < seq_len;
 +       ++i)
 +    {
 +      unsigned char bt = seq[i];
@@ -49,8 +51,8 @@
 +        }
 +
 +      *cp++ = '%';
-+      *cp++ = ACE::nibble2hex ((bt >> 4) & 0x0f);
-+      *cp++ = ACE::nibble2hex (bt & 0x0f);
++      *cp++ = static_cast<char> (ACE::nibble2hex ((bt >> 4) & 0x0f));
++      *cp++ = static_cast<char> (ACE::nibble2hex (bt & 0x0f));
 +    }
 +  // Zero terminate
 +  *cp = '\0';
@@ -59,7 +61,7 @@
 +CORBA::Boolean
 +TAO::ObjectKey::is_legal (unsigned char c)
 +{
-+  if (isalnum(c))
++  if (isalnum (c))
 +  {
 +    return true;
 +  }
@@ -74,8 +76,9 @@
 +}
 +
 +void
-+TAO::ObjectKey::decode_string_to_sequence (TAO::unbounded_value_sequence<CORBA::Octet> &seq,
-+                                           const char *str)
++TAO::ObjectKey::decode_string_to_sequence (
++  TAO::unbounded_value_sequence<CORBA::Octet> & seq,
++  char const * str)
 +{
 +  if (str == 0)
 +    {
@@ -90,13 +93,12 @@
 +  // 64-bit MS Windows builds.
 +  CORBA::ULong const len =
 +    ACE_Utils::truncate_cast<CORBA::ULong> (str_len);
-+
-+  char const * const eos = str + len;
++  
++  char const * const eos = str + str_len;
 +  char const *       cp  = str;
 +
-+  // Set the length of the sequence to be as long as
-+  // we'll possibly need...we'll reset it to the actual
-+  // length later.
++  // Set the length of the sequence to be as long as we'll possibly
++  // need...we'll reset it to the actual length later.
 +  seq.length (len);
 +
 +  CORBA::ULong i = 0;
@@ -168,49 +170,32 @@
 +}
 +
  #endif /* end #if !defined */
-
+ 
  // TAO_IDL - Generated from
---- orig/Object_KeyC.h	2005-04-08 10:17:40.978604800 +0200
-+++ Object_KeyC.h	2005-04-08 10:17:41.879900800 +0200
-@@ -117,4 +117,23 @@
-       )
-       : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
+--- orig/Object_KeyC.h	2008-03-27 08:13:22.000000000 -0500
++++ Object_KeyC.h	2008-03-27 08:13:40.000000000 -0500
+@@ -117,6 +117,24 @@
+       : TAO::unbounded_value_sequence<CORBA::Octet> (length, mb) {}
  #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-+
+ 
 +    // Hand crafted.
 +
 +    static void encode_sequence_to_string (
-+        char * &str,
-+        const TAO::unbounded_value_sequence<CORBA::Octet> &seq
++        char* & str,
++        TAO::unbounded_value_sequence<CORBA::Octet> const & seq
 +      );
 +    static void decode_string_to_sequence (
 +        TAO::unbounded_value_sequence<CORBA::Octet> &seq,
-+        const char *str
++        char const * str
 +      );
 +    static CORBA::Boolean is_legal (unsigned char c);
 +
 +    /// A special method that gives no regard to how the ORB has
 +    /// configured  the resource factory. This will be used only
 +    /// during Profile decoding and should be safe. This is a solution
-+    /// for the bug report [BUG 1616]
-+    static CORBA::Boolean demarshal_key (ObjectKey &key,
-+                                         TAO_InputCDR &cdr);
++    /// for the bug report [Bug 1616]
++    static CORBA::Boolean demarshal_key (ObjectKey & key,
++                                         TAO_InputCDR & cdr);
    };
-
- #endif /* end #if !defined */
-
-Index: Object_KeyC.cpp
-===================================================================
---- Object_KeyC.cpp	(revision 79001)
-+++ Object_KeyC.cpp	(working copy)
-@@ -130,8 +130,8 @@
-         }
  
-       *cp++ = '%';
--      *cp++ = ACE::nibble2hex ((bt >> 4) & 0x0f);
--      *cp++ = ACE::nibble2hex (bt & 0x0f);
-+      *cp++ = static_cast<char> (ACE::nibble2hex ((bt >> 4) & 0x0f));
-+      *cp++ = static_cast<char> (ACE::nibble2hex (bt & 0x0f));
-     }
-   // Zero terminate
-   *cp = '\0';
+ #endif /* end #if !defined */
diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.cpp b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
index 12bb22f6dd4..83708d86fde 100644
--- a/TAO/tests/Bug_3251_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
@@ -77,9 +77,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
     return -1;
   }
 
-  ma_barrier_ = std::auto_ptr < ACE_Thread_Barrier >(
-    new ACE_Thread_Barrier(threadCnt + 1)
-  );
+  ACE_auto_ptr_reset (ma_barrier_, new ACE_Thread_Barrier (threadCnt + 1));
 
   this->activate(
     THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED,
author	iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2008-03-27 13:55:59 +0000
committer	iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2008-03-27 13:55:59 +0000
commit	439bdfdc65fb513fc6d60068d6816904d3b988f7 (patch)
tree	63fca5a8f378543317ec068537f644f0005412d5
parent	116b8b6cdfaace9e7ca197f663d91c9efccb71d5 (diff)
download	ATCD-439bdfdc65fb513fc6d60068d6816904d3b988f7.tar.gz