summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a27
-rw-r--r--TAO/docs/TAO-metrics.html2
-rw-r--r--TAO/docs/TAO-tutorials.html8
-rw-r--r--TAO/docs/components.html8
-rw-r--r--TAO/docs/events_tutorial.html36
-rw-r--r--TAO/docs/poa_migration.html9
-rw-r--r--TAO/docs/reactivator.html2
-rw-r--r--TAO/docs/releasenotes.html2
-rw-r--r--TAO/docs/releasenotes/OBV.html2
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html4
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html4
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Persistent/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/index.html2
-rw-r--r--TAO/tao/ORB_Core.i2
-rw-r--r--TAO/tao/Strategies/advanced_resource.cpp2
-rw-r--r--TAO/tao/Stub.i2
-rw-r--r--TAO/tao/default_resource.cpp2
18 files changed, 69 insertions, 49 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 0f7226108f8..92aa4f4d0d5 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,30 @@
+Sat Mar 3 16:31:31 2001 Darrell Brunsch <brunsch@uci.edu>
+
+ * docs/TAO-metrics.html:
+ * docs/TAO-tutorials.html:
+ * docs/components.html:
+ * docs/events_tutorial.html:
+ * docs/poa_migration.html:
+ * docs/reactivator.html:
+ * docs/releasenotes.html:
+ * docs/releasenotes/OBV.html:
+ * docs/tutorials/Quoter/index.html:
+ * docs/tutorials/Quoter/On_Demand_Activation/index.html:
+ * docs/tutorials/Quoter/Simple/Impl-Repo/index.html:
+ * docs/tutorials/Quoter/Simple/ImprovedServer/index.html:
+ * docs/tutorials/Quoter/Simple/Persistent/index.html:
+
+ Changed references to
+ http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to
+ relative paths instead (Fixes fuzz errors).
+
+ * tao/ORB_Core.i:
+ * tao/Stub.i:
+ * tao/default_resource.cpp:
+ * tao/Strategies/advanced_resource.cpp:
+
+ Fixed bad ACE_TRACE's. (Fixes more fuzz errors)
+
Sat Mar 3 16:31:07 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
* examples/PluggableUDP/DIOP/DIOP_Acceptor.{cpp,i,h}:
diff --git a/TAO/docs/TAO-metrics.html b/TAO/docs/TAO-metrics.html
index 646f89c13e2..51affd4e528 100644
--- a/TAO/docs/TAO-metrics.html
+++ b/TAO/docs/TAO-metrics.html
@@ -31,7 +31,7 @@ benchmarking of TAO.
<LI> <A HREF="http://www.cs.wustl.edu/~schmidt/ami2.ps.gz">TAO's AMI performance</A>
<LI> <A HREF="http://www.cs.wustl.edu/~schmidt/pluggable_protocols.ps.gz">TAO's
pluggable protocols performance</A>
-<LI> <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/docs/ACE-subsets.html">Subsetting of ACE and minimum TAO</A>
+<LI> <A HREF="../../docs/ACE-subsets.html">Subsetting of ACE and minimum TAO</A>
<LI> Current and past performance and footprint metrics are available
from our <A HREF="http://doc.ece.uci.edu/Stats/">nightly builds
</A>.
diff --git a/TAO/docs/TAO-tutorials.html b/TAO/docs/TAO-tutorials.html
index 3934566ac7b..74b70920c3c 100644
--- a/TAO/docs/TAO-tutorials.html
+++ b/TAO/docs/TAO-tutorials.html
@@ -15,7 +15,7 @@
<DL>
<DL>
<DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/tutorials/Quoter/">Quoter
+HREF="tutorials/Quoter/">Quoter
tutorial</A> <P>
<DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> This
@@ -35,15 +35,13 @@ Developer's Guide</A> available from <A
HREF="http://www.theaceorb.com/">OCI</A>. <P>
<DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif">
- <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/docs/tutorials/new-tutorials.html">Developing new
+ <A HREF="tutorials/new-tutorials.html">Developing new
tutorials</A> <P>
</DL>
<HR><P>
- Back to the <A
- HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/">TAO
- documents</A> page.
+ Back to the <A HREF="index.html">TAO documents</A> page.
<!--#include virtual="/~schmidt/cgi-sig.html" -->
</BODY>
diff --git a/TAO/docs/components.html b/TAO/docs/components.html
index c24b6622cdd..59f95be0468 100644
--- a/TAO/docs/components.html
+++ b/TAO/docs/components.html
@@ -29,11 +29,9 @@ bgcolor="#ffffff">
all request in one thread, each request in a separate thread, or each connection
in a separate thread, <em>etc.</em><P>
- <LI> Mapping of all <A
- HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/">TAO files</A>
- into a manageable set of <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/TAO-inheritance.ps.gz">inheritance
-hierarchies</A>. <P>
+ <LI> Mapping of all <A HREF="../">TAO files</A>
+ into a manageable set of <A HREF="../TAO-inheritance.ps.gz">inheritance
+ hierarchies</A>. <P>
</UL>
</BODY>
diff --git a/TAO/docs/events_tutorial.html b/TAO/docs/events_tutorial.html
index 20097005bea..c8e3a3561d2 100644
--- a/TAO/docs/events_tutorial.html
+++ b/TAO/docs/events_tutorial.html
@@ -628,7 +628,7 @@ defaults to 1.
<tr><td>
The following code is derived from the EC_Throughput consumer code, which can be
found in TAO in the file:
-<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp">
+<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp">
$TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp</a>
<tr><td>
@@ -711,7 +711,7 @@ Test_Consumer::connect (const char* name,
<tr><td>
The following code is derived from the EC_Throughput consumer driver code, which
can be found in TAO in the file:
-<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp">
+<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp">
$TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp</a>
<tr><td>
@@ -858,7 +858,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
<tr><td>
The following code is derived from the EC_Throughput consumer code, which
can be found in TAO in the file:
-<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp">
+<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp">
$TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp</a>
<tr><td>
@@ -924,7 +924,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
<tr><td>
The following code is derived from the EC_Throughput consumer code, which can be
found in TAO in the file:
-<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp">
+<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp">
$TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp</a>
<tr><td>
@@ -1087,7 +1087,7 @@ server.
<tr><td>
The following code is derived from the EC_Throughput supplier code, which
can be found in TAO in the file:
-<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp">
+<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp">
$TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp</a>
@@ -1201,7 +1201,7 @@ Test_Supplier::connect (const char* name,
<tr><td>
The following code is derived from the EC_Throughput supplier driver code, which
can be found in TAO in the file:
-<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp">
+<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp">
$TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp</a>
<tr><td>
@@ -1352,7 +1352,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
<tr><td>
The following code is derived from the EC_Throughput supplier code, which
can be found in TAO in the file:
-<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp">
+<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp">
$TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp</a>
<tr><td>
@@ -1456,7 +1456,7 @@ Test_Supplier::svc ()
<tr><td>
The following code is derived from the EC_Throughput supplier code, which
can be found in TAO in the file:
-<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp">
+<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp">
$TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp</a>
@@ -1523,7 +1523,7 @@ Test_Supplier::disconnect (CORBA::Environment &_env)
<tr><td>
The following code is derived from the Event_Service executable, which can be
found in TAO in the file:
-<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/Event_Service/Event_Service.cpp">
+<A HREF="../orbsvcs/Event_Service/Event_Service.cpp">
$TAO_ROOT/orbsvcs/Event_Service/Event_Service.cpp</a>
<tr><td>
@@ -1719,38 +1719,38 @@ int main (int argc, char *argv[])
<tr><td>
A number of sample applications are available in the directories under
-<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/">
+<a href="../orbsvcs/tests/">
TAO's ORB Services tests</a>.
<tr><td>
In particular, much of the code shown in this tutorial was drawn from the
-<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/">
+<a href="../orbsvcs/tests/EC_Throughput/">
EC_Throughput</a> test. This test exercises the Event Service and measures its
throughput capabilities.
<tr><td>
A similar test,
-<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/Event_Latency/">
+<a href="../orbsvcs/tests/Event_Latency/">
Event_Latency</a>, measures the latency of events through the Event Service.
<tr><td>
The
-<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Basic/">
+<a href="../orbsvcs/tests/EC_Basic/">
EC_Basic</a> test demonstrates the basic use the Event Service.
<tr><td>
The
-<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Multiple/">
+<a href="../orbsvcs/tests/EC_Multiple/">
EC_Multiple</a> test shows a number of ways to connect multiple Event Channels.
<tr><td>
For the IDL source for the various interfaces, please see
-<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/orbsvcs/RtecScheduler.idl">RtecScheduler.idl</a>,
-<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/orbsvcs/CosEventChannelAdmin.idl">CosEventChannelAdmin.idl</a>,
-<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/orbsvcs/CosEventComm.idl">CosEventComm.idl</a>
+<a href="../orbsvcs/orbsvcs/RtecScheduler.idl">RtecScheduler.idl</a>,
+<a href="../orbsvcs/orbsvcs/CosEventChannelAdmin.idl">CosEventChannelAdmin.idl</a>,
+<a href="../orbsvcs/orbsvcs/CosEventComm.idl">CosEventComm.idl</a>
and
-<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/orbsvcs/CosNaming.idl">CosNaming.idl</a>.
+<a href="../orbsvcs/orbsvcs/CosNaming.idl">CosNaming.idl</a>.
</table>
diff --git a/TAO/docs/poa_migration.html b/TAO/docs/poa_migration.html
index bcb446b1d4d..fc52188f985 100644
--- a/TAO/docs/poa_migration.html
+++ b/TAO/docs/poa_migration.html
@@ -51,7 +51,7 @@ that, you must use the <CODE>_this</CODE> method.</li><P>
<li>Object ID's are assigned by the POA unless you activate the
servant with a specific ID. <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/performance-tests/Cubit/TAO/IDL_Cubit">IDL_Cubit</A>
+HREF="../performance-tests/Cubit/TAO/IDL_Cubit">IDL_Cubit</A>
has examples on how to do this.</li><P>
<li>Unlike the BOA, the POA explicitly addresses the temporal nature
@@ -193,15 +193,14 @@ the following to your header file:
To see the above example in detail, checkout <A
HREF="../examples/POA/Reference_Counted_Servant">TAO/examples/POA/Reference_Counted_Servant</A>
-and/or <A HREF="../tao/POA.cpp">POA.cpp</A> and <A
-HREF="../tao/POA.h">POA.h</A>. </li> <p>
+and/or <A HREF="../tao/PortableServer/POA.cpp">POA.cpp</A> and <A
+HREF="../tao/PortableServer/POA.h">POA.h</A>. </li> <p>
</ul>
<hr><P>
-Back to the <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/index.html">TAO
+Back to the <A HREF="index.html">TAO
documentation</A> page.
<!--#include virtual="/~schmidt/cgi-sig.html" -->
diff --git a/TAO/docs/reactivator.html b/TAO/docs/reactivator.html
index a1f7ecbc440..43e853d572e 100644
--- a/TAO/docs/reactivator.html
+++ b/TAO/docs/reactivator.html
@@ -16,7 +16,7 @@
<hr>
-<p>Back to the <a HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/index.html">TAO
+<p>Back to the <a HREF="index.html">TAO
documentation</a> page. <!--#include virtual="/~schmidt/cgi-sig.html" --> </p>
</body>
</html>
diff --git a/TAO/docs/releasenotes.html b/TAO/docs/releasenotes.html
index 21854918af1..03f1b5b2c73 100644
--- a/TAO/docs/releasenotes.html
+++ b/TAO/docs/releasenotes.html
@@ -21,6 +21,6 @@ Version 0.0.12</H3></CENTER>
<HR>
-This document has moved <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/releasenotes/index.html">here</a>.
+This document has moved <a href="releasenotes/index.html">here</a>.
</HTML>
diff --git a/TAO/docs/releasenotes/OBV.html b/TAO/docs/releasenotes/OBV.html
index b0d729c4179..4e6b619585b 100644
--- a/TAO/docs/releasenotes/OBV.html
+++ b/TAO/docs/releasenotes/OBV.html
@@ -61,7 +61,7 @@
</li>
<li><p><CODE>Valuetype</CODE>s can be used as arguments in CORBA invocations.
There is an example in
- <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/examples/OBV/Typed_Events">$TAO_ROOT/TAO/examples/OBV/Typed_Events</A>.
+ <A HREF="../../examples/OBV/Typed_Events">$TAO_ROOT/TAO/examples/OBV/Typed_Events</A>.
<CODE>Valuetype</CODE>s could even reference other
<CODE>valuetype</CODE> objects (but without sharing).
</p>
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html b/TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html
index 833749a9cc1..d848f9c8ae7 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html
@@ -96,7 +96,6 @@
the object ID is valid and then check for the servant we want to
create and create adn return the requested servant.
<PRE>
- <PRE>
PortableServer::Servant
Quoter_Stock_Factory_Locator_i::preinvoke (const PortableServer::ObjectId &oid,
PortableServer::POA_ptr poa,
@@ -254,7 +253,6 @@
<a href="../AMI/Handler_i.cpp">Handler_i.cpp</a>.
</P>
<H3>More Reading</H3>
- <P>The
<P>The <A HREF="http://www.triodia.com/staff/michi-henning.html">Henning</A> and
<A HREF="http://www.iona.com/hyplan/vinoski/">Vinoski</A>
<A HREF="http://www.iona.com/hyplan/vinoski/#book">CORBA book</A>
@@ -263,7 +261,7 @@
in C++ Report also include several articles about the POA. Finally,
the <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a>
distribution includes
- <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/examples/POA">examples</A> that illustrate how to use the POA policies.
+ <A HREF="../../../../examples/POA">examples</A> that illustrate how to use the POA policies.
</P>
<hr>
<address><a href="mailto:pgontla@ece.uci.edu">Priyanka Gontla</a></address>
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html
index 3311b0071a6..46c4d13dd6d 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html
@@ -136,14 +136,14 @@
</PRE>
<H3>More Reading</H3>
<P>More information on Implementation Repository is
- <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/implrepo/index.html">here</A>.
+ <A HREF="../../../../implrepo/index.html">here</A>.
</P>
<P>The <A HREF="http://www.triodia.com/staff/michi-henning.html">Henning</A> and <A HREF="http://www.iona.com/hyplan/vinoski/">Vinoski</A>
<A HREF="http://www.iona.com/hyplan/vinoski/#book">CORBA book</A> discusses POA policies in detail. Likewise,
the Schmidt and Vinoski
<A HREF="http://www.cs.wustl.edu/~schmidt/report-doc.html">columns</A> in C++ Report also include several articles about the POA. Finally,
the <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</A>
- distribution includes <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/examples/POA">examples</A> that illustrate how
+ distribution includes <A HREF="../../../../../examples/POA">examples</A> that illustrate how
to use the POA policies.
</P>
<hr>
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html
index 67dedb8820b..5c150bc540f 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html
@@ -328,7 +328,7 @@ HREF="http://www.triodia.com/staff/michi-henning.html">Henning</A> and
in C++ Report also include several articles about the POA. Finally,
the <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a> distribution includes
<A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/examples/POA">examples</A>
+HREF="../../../../../examples/POA">examples</A>
that illustrate how to use the POA policies.
</P>
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/index.html b/TAO/docs/tutorials/Quoter/Simple/Persistent/index.html
index 03a8120b216..04451cddc4c 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/index.html
@@ -359,7 +359,7 @@
TAO
</A>
distribution includes several
- <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/examples/POA">
+ <A HREF="../../../../../examples/POA">
examples
</A>
that illustrate how to use the POA policies.
diff --git a/TAO/docs/tutorials/Quoter/index.html b/TAO/docs/tutorials/Quoter/index.html
index c764755cf39..d5b75455b67 100644
--- a/TAO/docs/tutorials/Quoter/index.html
+++ b/TAO/docs/tutorials/Quoter/index.html
@@ -33,7 +33,7 @@
reliable oneways</A>,
the <A HREF="http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz">
real-time Events Service</A>,
- the <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/INS.html">
+ the <A HREF="../../INS.html">
Interoperable Naming Service</A>
support and much more.
</P>
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 4b89f790bd4..b8cc9db3212 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -812,7 +812,7 @@ TAO_ORB_Core_Auto_Ptr::reset (TAO_ORB_Core *p)
ACE_INLINE TAO_ORB_Core *
TAO_ORB_Core_Auto_Ptr::operator-> () const
{
- ACE_TRACE ("auto_ptr::operator->");
+ ACE_TRACE ("TAO_ORB_Core_Auto_Ptr::operator->");
return this->get ();
}
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 86fc384ab72..cda77541196 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -61,7 +61,7 @@ TAO_Advanced_Resource_Factory::~TAO_Advanced_Resource_Factory (void)
int
TAO_Advanced_Resource_Factory::init (int argc, char **argv)
{
- ACE_TRACE ("TAO_Advanced_Resource_Factory::parse_args");
+ ACE_TRACE ("TAO_Advanced_Resource_Factory::init");
int curarg = 0;
diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i
index dae3d044b8d..02c950c6e5e 100644
--- a/TAO/tao/Stub.i
+++ b/TAO/tao/Stub.i
@@ -323,7 +323,7 @@ TAO_Stub_Auto_Ptr::reset (TAO_Stub *p)
ACE_INLINE TAO_Stub *
TAO_Stub_Auto_Ptr::operator-> () const
{
- ACE_TRACE ("auto_ptr::operator->");
+ ACE_TRACE ("TAO_Stub_Auto_Ptr::operator->");
return this->get ();
}
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index c2cfc5cbb6a..cded694781c 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -59,7 +59,7 @@ TAO_Default_Resource_Factory::~TAO_Default_Resource_Factory (void)
int
TAO_Default_Resource_Factory::init (int argc, char **argv)
{
- ACE_TRACE ("TAO_Default_Server_Strategy_Factory::parse_args");
+ ACE_TRACE ("TAO_Default_Resource_Factory::init");
this->parser_names_count_ = 0;