<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=gb2312">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:DengXian;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:DengXian;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
text-align:justify;
text-justify:inter-ideograph;
font-size:10.5pt;
font-family:DengXian;}
.MsoChpDefault
{mso-style-type:export-only;}
/* Page Definitions */
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 90.0pt 72.0pt 90.0pt;}
div.WordSection1
{page:WordSection1;}
--></style>
</head>
<body lang="ZH-CN" link="blue" vlink="#954F72" style="word-wrap:break-word">
<div class="WordSection1">
<p class="MsoNormal"><span lang="EN-US" style="font-size:12.0pt"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">Index: src/lib/omniORB/orbcore/corbaString.cc</span></p>
<p class="MsoNormal"><span lang="EN-US">===================================================================</span></p>
<p class="MsoNormal"><span lang="EN-US">--- src/lib/omniORB/orbcore/corbaString.cc (</span>版本<span lang="EN-US"> 6632)</span></p>
<p class="MsoNormal"><span lang="EN-US">+++ src/lib/omniORB/orbcore/corbaString.cc (</span>工作副本<span lang="EN-US">)</span></p>
<p class="MsoNormal"><span lang="EN-US">@@ -80,14 +80,14 @@</span></p>
<p class="MsoNormal"><span lang="EN-US"> OMNIORB_THROW(MARSHAL, MARSHAL_PassEndOfMessage,</span></p>
<p class="MsoNormal"><span lang="EN-US"> (CORBA::CompletionStatus)completion());</span></p>
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">- char* s = _CORBA_String_helper::alloc(len - 1);</span></p>
<p class="MsoNormal"><span lang="EN-US">- get_octet_array((_CORBA_Octet*)s, len);</span></p>
<p class="MsoNormal"><span lang="EN-US">+ _CORBA_String_var s = _CORBA_String_helper::alloc(len - 1);</span></p>
<p class="MsoNormal"><span lang="EN-US">+ get_octet_array((_CORBA_Octet*)s.inout(), len);</span></p>
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"> if (s[len-1] != '\0')</span></p>
<p class="MsoNormal"><span lang="EN-US"> OMNIORB_THROW(MARSHAL,MARSHAL_StringNotEndWithNull,</span></p>
<p class="MsoNormal"><span lang="EN-US"> (CORBA::CompletionStatus)completion());</span></p>
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">- return s;</span></p>
<p class="MsoNormal"><span lang="EN-US">+ return s._retn();</span></p>
<p class="MsoNormal"><span lang="EN-US">}</span></p>
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">#ifndef Swap32</span></p>
<p class="MsoNormal"><span lang="EN-US" style="font-size:12.0pt;font-family:SimSun"><o:p> </o:p></span></p>
</div>
</body>
</html>