summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ACE/ChangeLog10
-rw-r--r--ACE/THANKS4
-rw-r--r--ACE/ace/Reactor.h3
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_status.cpp1
-rw-r--r--ACE/examples/Reactor/Proactor/test_end_event_loop.cpp1
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/docs/components.html1
-rw-r--r--TAO/docs/documentation.html37
-rw-r--r--TAO/docs/index.html24
9 files changed, 68 insertions, 20 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index f6599d12bea..9dafc5c42d1 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jun 26 13:48:26 UTC 2007 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
+
+ * apps/JAWS2/HTTPU/http_status.cpp: Added
+
+ #include "ace/Log_Msg.h"
+
+ so the ACE_DEBUG macro would be visible. Thanks to Venkat
+ Forums <venkat dot forums at gmail dot com> for reporting this.
+
Thu Jun 28 07:32:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Truncate.h:
@@ -230,6 +239,7 @@ Wed Jun 27 03:50:39 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
fixed). For now, it will only flag that fact that a file contains
tabs once.
+>>>>>>> .r78612
Mon Jun 25 11:34:36 CDT 2007 Ciju John <johnc@ociweb.com>
* ACE version 5.5.9 released.
diff --git a/ACE/THANKS b/ACE/THANKS
index 347bb4155ee..5b84e977904 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -1911,7 +1911,7 @@ Matthew Townsend <mtownsen at harris dot com>
Rick Robinson <rick at oyarsa dot com>
John D. Robertson <john at rrci dot com>
Paul Lew <paullew at cisco dot com>
-Eider Oliveira <eider at oliveira dot gmail at com>
+Eider Oliveira <eider dot oliveira at gmail dot com>
Jeff Jones <jjones at zonetrading dot com>
Jean-Christophe Cota <jean-christophe dot cota at eurocontrol dot int>
Paul <paul at reeder dot cs>
@@ -2207,6 +2207,8 @@ Jules d'Entremont <Jules dot dEntremont at SolaceSystems dot com>
Rajiv K. Shukla <rajiv_shukla at yahoo dot com>
Haibin Zhang <dragzhb at yahoo dot com dot cn>
Vikram Karandikar <softking at gmail dot com>
+Kim J. Schmock <KJS at capres dot com>
+Venkat Forums <venkat dot forums at gmail dot com>
James Marsh <jmarsh at cs dot man dot ac dot uk>
Shaolong Xiang <cwengc at gmail dot com>
Christoph Hofmann <Christoph dot Hofmann at zwick dot de>
diff --git a/ACE/ace/Reactor.h b/ACE/ace/Reactor.h
index 492226465af..18c968b3980 100644
--- a/ACE/ace/Reactor.h
+++ b/ACE/ace/Reactor.h
@@ -341,7 +341,8 @@ public:
* Register handler for OS events.
*
* Register an <event_handler> that will be notified when
- * <event_handle> is signaled.
+ * <event_handle> is signaled. This will call back its
+ * <handle_signal> hook method.
*
* Reactor will call ACE_Event_Handler::add_reference() for a new
* handler/handle pair.
diff --git a/ACE/apps/JAWS2/HTTPU/http_status.cpp b/ACE/apps/JAWS2/HTTPU/http_status.cpp
index 99ce69f1f58..75a69ffd0d0 100644
--- a/ACE/apps/JAWS2/HTTPU/http_status.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_status.cpp
@@ -1,5 +1,6 @@
// $Id$
+#include "ace/Log_Msg.h"
#include "HTTPU/http_status.h"
const char *
diff --git a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
index 641a8785c6f..a6308e18339 100644
--- a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
+++ b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
@@ -48,7 +48,6 @@ public:
: time_flag_ (0)
{}
-
virtual ~My_Task (void) {}
// Destructor.
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d6683935993..80e219dc711 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 25 20:57:14 UTC 2007 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
+
+ * docs: Added a new file called documentation.html to describe the
+ TAO programmer's guides in a single place.
+
Thu Jun 28 04:28:26 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
* utils/nslist/nslist.cpp:
@@ -60,7 +65,6 @@ Wed Jun 27 23:49:36 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
which I changed to "ace/streams.h" to appease compilers that are
case sensitive.
-
Wed Jun 27 09:50:00 UTC 2007 Simon Massey <sma@prismtech.com>
* orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Bug_2962_Regression.mpc:
@@ -201,6 +205,7 @@ Wed Jun 27 03:23:14 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
yet TAO_ORB_Manager has been removed for a long while now. Update
the class documentation to remove references to TAO_ORB_Manager.
+>>>>>>> .r78612
Mon Jun 25 11:34:36 CDT 2007 Ciju John <johnc@ociweb.com>
* TAO version 1.5.9 released.
diff --git a/TAO/docs/components.html b/TAO/docs/components.html
index dcd890a3473..2f8d5fcf34b 100644
--- a/TAO/docs/components.html
+++ b/TAO/docs/components.html
@@ -42,6 +42,7 @@ bgcolor="#ffffff">
reduce the compilation times and memory footprints for
ACE+TAO and its applications. <P>
+ <dt> <img alt="o" src="redball.gif"> <a HREF="Tags.html">Tags and Magic Numbers</a> </dt><P>
</UL>
</BODY>
diff --git a/TAO/docs/documentation.html b/TAO/docs/documentation.html
new file mode 100644
index 00000000000..9a76f0b701d
--- /dev/null
+++ b/TAO/docs/documentation.html
@@ -0,0 +1,37 @@
+<HTML>
+<!-- $Id$ -->
+ <HEAD>
+ <META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
+ <TITLE>TAO Programmer's Guides</TITLE>
+ </HEAD>
+
+<BODY text = "#000000"
+link="#000fff"
+vlink="#ff0f0f"
+bgcolor="#ffffff">
+
+<HR>
+ <H3 ALIGN=CENTER>TAO Programmer's Guides and Tutorials</H3>
+
+ <P>The following TAO programmer guides are available:</P>
+
+ <UL>
+ <DT> <img alt="o" src="redball.gif"> <A HREF="http://www.dre.vanderbilt.edu/Doxygen/">Doxygen Documentation</A> <P>
+
+ <dt> <img alt="o" src="redball.gif"> <a HREF="http://www.theaceorb.com/product/index.html">OCI TAO Developer's Guide</a> </dt><P>
+
+ <dt> <img alt="o" src="redball.gif"> <a HREF="http://www.theaceorb.nl/en/tpg.html"">Remedy TAO Programmer's Guide</a> </dt><P>
+
+ <dt> <img alt="o" src="redball.gif"> <a HREF="orbsvcs.html">Online ORB Services Documentation</a> </dt><P>
+
+ <dt> <img alt="o" src="redball.gif"> <a HREF="pluggable_protocols/index.html">Writing Pluggable Protocols</a> </dt><P>
+ </UL>
+
+ </BODY>
+
+<P><HR><P>
+Back to the TAO <A HREF="index.html">documentation index</A>.
+
+<!--#include virtual="/~schmidt/cgi-sig.html" -->
+
+</HTML>
diff --git a/TAO/docs/index.html b/TAO/docs/index.html
index 3823b606983..1b10e5aff3d 100644
--- a/TAO/docs/index.html
+++ b/TAO/docs/index.html
@@ -21,38 +21,30 @@ HREF="http://www.omg.org/library/c2indx.html">CORBA</a> Documentation</h3>
<td><font SIZE="+1"><dl>
<dt> <img alt="o" src="redball.gif"> TAO <a HREF="http://www.cs.wustl.edu/~schmidt/corba-research-realtime.html">Technical
Papers</a> </dt><P>
- <dt> <img alt="o" src="redball.gif"> TAO <a HREF="http://www.cs.wustl.edu/~schmidt/TAO/index.html">Tutorials</a></dt><P>
- <dt> <img alt="o" src="redball.gif"> TAO <a HREF="releasenotes/index.html">Release Notes</a> </dt><P>
+ <dt> <img alt="o"
+ src="redball.gif"> <a HREF="documentation.html">Programmer's Guides</A> </dt><P>
+
+ <dt> <img alt="o" src="redball.gif"> TAO <a HREF="http://www.cs.wustl.edu/~schmidt/TAO/index.html">Tutorials</a></dt><P>
+
<dt> <img alt="o" src="redball.gif"> <A HREF="http://www.theaceorb.com">OCI</A> TAO <a HREF="http://www.theaceorb.com/faq/">FAQ</a> </dt><P>
</dl>
</td>
<td><font SIZE="+1"><dl>
- <DT> <img alt="o" src="redball.gif"> <A
- HREF="http://www.dre.vanderbilt.edu/Doxygen/">Doxygen Documentation</A> <P>
<dt> <img alt="o"
src="redball.gif"> <a HREF="components.html">ORB Configuration & Tuning</a> </dt><P>
<dt> <img alt="o" src="redball.gif"> TAO <a HREF="compiler.html">IDL Compiler Options</a> </dt><P>
<dt> <img alt="o"
src="redball.gif"> TAO <a HREF="libraries.html">Library Subsets</a></dt><p>
+ <dt> <img alt="o" src="redball.gif"> TAO <a HREF="releasenotes/index.html">Release Notes</a> </dt><P>
</dl>
</td>
<td><font SIZE="+1"><dl>
- <dt> <img alt="o" src="redball.gif"> <a HREF="orbsvcs.html">ORB Services Documentation</a> </dt><P>
- <dt> <img alt="o" src="redball.gif"> <a HREF="Tags.html">Tags and Magic Numbers</a> </dt><P>
- <dt> <img alt="o" src="redball.gif"> TAO <a href="rtcorba/index.html">Real-Time CORBA</a> </dt><P>
<dt> <img alt="o" src="redball.gif"> <a HREF="INS.html">Interoperable Naming Service</a> </dt><P>
- </dl>
- </font>
- </td>
-
- <td><font SIZE="+1"><dl>
<dt> <img alt="o" src="redball.gif"> <a HREF="implrepo/index.html">Implementation Repository</a> </dt><P>
- <dt> <img alt="o" src="redball.gif"> TAO <a href="exceptions.html">Exception Handling</a></dt><p>
- <dt> <img alt="o" src="redball.gif"> <a HREF="pluggable_protocols/index.html">Writing Pluggable Protocols</a> </dt><P>
- <dt> <img alt="o"
- src="redball.gif"> <a HREF="es_configs.html">Event Service Configurations</a> </dt><P>
+ <dt> <img alt="o" src="redball.gif"> TAO <a href="rtcorba/index.html">Real-Time CORBA</a> </dt><P>
+ <dt> <img alt="o" src="redball.gif"> <a HREF="es_configs.html">Event Service Configurations</a> </dt><P>
</dl>
</font>
View Lorry Controller Status