summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-10-04 19:31:38 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-10-04 19:31:38 +0000
commitf09de3f7b03d331a97da1bd4a73dbfb1b5a61905 (patch)
treedcc129572186a7a36248e6f0596364d49ff75690
parent370b4df19b4f2a782508b12d5d4baeb18a9ef881 (diff)
downloadATCD-f09de3f7b03d331a97da1bd4a73dbfb1b5a61905.tar.gz
Mon Oct 4 19:26:55 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* COPYING: * TAO-INSTALL.html: Small updates * TAO_IDL/be/be_visitor_component/servant_svs.cpp: Fixed memory leak of the Port_Activator
-rw-r--r--TAO/COPYING20
-rw-r--r--TAO/ChangeLog14
-rw-r--r--TAO/TAO-INSTALL.html20
-rw-r--r--TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp4
4 files changed, 35 insertions, 23 deletions
diff --git a/TAO/COPYING b/TAO/COPYING
index d1528f811b1..551231de6cf 100644
--- a/TAO/COPYING
+++ b/TAO/COPYING
@@ -1,10 +1,10 @@
_________________________________________________________________
-
+
Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM),
DAnCE(TM), and CoSMIC(TM)
-
- [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), DAnCE>(TM), and [4]CoSMIC(TM)
+
+ [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), DAnCE(TM), and [4]CoSMIC(TM)
(henceforth referred to as "DOC software") are copyrighted by
[5]Douglas C. Schmidt and his [6]research group at [7]Washington
University, [8]University of California, Irvine, and [9]Vanderbilt
@@ -17,7 +17,7 @@
built using DOC software that you release. No copyright statement
needs to be provided if you just ship binary executables of your
software products.
-
+
You can use DOC software in commercial and/or binary software releases
and are under no obligation to redistribute any of your source code
that is built using DOC software. Note, however, that you may not
@@ -28,7 +28,7 @@
using DOC software in your software, though we encourage you to let
[10]us know so we can promote your project in the [11]DOC software
success stories.
-
+
The [12]ACE, [13]TAO, [14]CIAO, [15]DAnCE, and [16]CoSMIC web sites
are maintained by the [17]DOC Group at the [18]Institute for Software
Integrated Systems (ISIS) and the [19]Center for Distributed Object
@@ -51,7 +51,7 @@
University, UC Irvine, or Vanderbilt University, their employees, or
students be liable for any lost revenue or profits or other special,
indirect and consequential damages.
-
+
DOC software is provided with no support and without any obligation on
the part of Washington University, UC Irvine, Vanderbilt University,
their employees, or students to assist in its use, correction,
@@ -65,7 +65,7 @@
obtains time/date and calendaring information from operating systems
users will not be affected by the new DST rules as long as they
upgrade their operating systems accordingly.
-
+
The names ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), CoSMIC(TM),
Washington University, UC Irvine, and Vanderbilt University, may not
be used to endorse or promote products or services derived from this
@@ -75,13 +75,13 @@
TAO(TM), CIAO(TM), DAnCE(TM), or CoSMIC(TM), nor does it grant
permission for the name Washington University, UC Irvine, or
Vanderbilt University to appear in their names.
-
+
If you have any suggestions, additions, comments, or questions, please
let [21]me know.
-
+
[22]Douglas C. Schmidt
_________________________________________________________________
-
+
Back to the [23]ACE home page.
References
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index fa8f16207c9..006c7fd3dac 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,19 @@
+Mon Oct 4 19:26:55 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * COPYING:
+ * TAO-INSTALL.html:
+ Small updates
+
+ * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+ Fixed memory leak of the Port_Activator
+
+ * tao/Valuetype/ValueBase.h:
+ Docu update
+
Mon Oct 4 13:35:02 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
- Remove one noevents ifdef.
+ Remove one noevents ifdef.
Mon Oct 4 10:35:02 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 6c542749ced..d8b5259f8c3 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -24,38 +24,38 @@
<p>The following table summarizes platforms on which TAO runs, see the
-<a href="../ACE/ACE-INSTALL.html#platforms">ACE installation notes</A> for an
+<a href="../ACE-INSTALL.html#platforms">ACE installation notes</A> for an
overview of all the platforms ACE runs on, these are all candidates
to run TAO on:<P>
<table width="100%" border=1>
<tr valign=top>
<td><b>Fully supported, i.e., continually tested and used daily</b></td>
- <td>Solaris 7, 8, 9, 10 & 11, Windows 2000/XP/2003/Vista (7.1, and 8.0 and
- Borland C++ Builder 6/2006/2007), Linux/Intel (Redhat,
- Debian and SuSe), VxWorks 5.5.1/6.2/6.3/6.4/6,5, OpenVMS 8.2 & 8.3
- Alpha & IA64
+ <td>Solaris 9, 10 & 11, Windows XP/2003/Vista (Microsoft Visual C++ 7.1, 8.0, 9.0, and 10.0),
+ Linux/Intel (Redhat,
+ Debian and SuSe), OpenVMS 8.3 IA64
</td>
</tr>
<tr valign=top bgcolor="#AFAFAF">
<td><b>Nearly fully supported, i.e., periodically tested</b></td>
- <td>Windows 9x/ME, HP/UX 11.x, LynxOS, and AIX 4.x
+ <td>HP/UX 11.x, LynxOS, and AIX 5.x
</td>
</tr>
<tr valign=top>
<td><b>Partially supported, i.e., infrequently tested</b></td>
<td> FreeBSD, NetBSD, Chorus, Tandem NS,
- DEC UNIX 6.5, Linux/Alpha (Redhat and Debian), and MACOSX
+ Linux/Alpha (Redhat, SuSE, and Debian), and MACOSX
</td>
</tr>
<tr valign=top bgcolor="#AFAFAF">
<td><b>Planned support, i.e., pending</b></td>
- <td> MVS, Windows CE, SCO, UnixWare</td>
+ <td>Windows CE</td>
</tr>
<tr valign=top>
<td><b>Compilers whose support were dropped recently</b></td>
- <td> Borland C++ Builder 4 and 5, Sun/C++ 5.1 through 5.4, g++
- prior to 2.95.x, HP/UX 10.x, pSoS, Chorus
+ <td> Borland C++ Builder, Sun/C++ 5.1 through 5.4, g++
+ prior to 2.95.x, HP/UX 10.x, pSoS, Chorus, DEC UNIX, SCO, UnixWare, MVS,
+ Windows 9x/ME
</td>
</tr>
</table>
diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
index 186ab9985db..58d1a25c042 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
@@ -315,7 +315,7 @@ be_visitor_servant_svs::visit_provides (be_provides *node)
<< "::CIAO::Servant_Activator_var sa =" << be_idt_nl
<< "this->container_->ports_servant_activator ();"
<< be_uidt_nl << be_nl
- << "if (sa->register_port_activator (pa._retn ()))"
+ << "if (sa->register_port_activator (pa.in ()))"
<< be_idt_nl
<< "{" << be_idt_nl
<< "::CORBA::Object_var obj =" << be_idt_nl
@@ -599,7 +599,7 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node)
<< "::CIAO::Servant_Activator_var sa =" << be_idt_nl
<< "this->container_->ports_servant_activator ();"
<< be_uidt_nl << be_nl
- << "if (sa->register_port_activator (pa._retn ()))"
+ << "if (sa->register_port_activator (pa.in ()))"
<< be_idt_nl
<< "{" << be_idt_nl
<< "::CORBA::Object_var obj =" << be_idt_nl