summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1996-12-24 17:30:29 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1996-12-24 17:30:29 +0000
commitb921ff63928bb2f3bf0e97a3bc8b5d79488cbab4 (patch)
tree349b0e0037ab6646cd38813dfd5784d969c647aa
parent128e1e78402ed7f9ebd097edb7494a0a2cb4d68e (diff)
downloadATCD-b921ff63928bb2f3bf0e97a3bc8b5d79488cbab4.tar.gz
foo
-rw-r--r--ChangeLog-96b14
-rw-r--r--README3
-rw-r--r--examples/Threads/task_three.cpp2
3 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog-96b b/ChangeLog-96b
index 95940096138..6628cdc428a 100644
--- a/ChangeLog-96b
+++ b/ChangeLog-96b
@@ -1,3 +1,16 @@
+Tue Dec 24 10:55:20 1996 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * examples/Threads/task_three.cpp (main): Changed the use of
+ new-style C++ casts for ACE_Sig_Action to old-style C casts so
+ that more picky compilers like GCC won't complain. Thanks to
+ Sandro Doro <alex@aureus.sublink.org> for reporting this.
+
+Sun Dec 22 21:16:23 1996 Douglas C. Schmidt <schmidt@mambo.cs.wustl.edu>
+
+ * ace/OS.cpp (thr_create): added a new ACE_HAS_PTHREADS_XAVIER to
+ deal with the sparam.sched_priority features of the Linux
+ pthreads implementation. Thanks to James Johnson for this.
+
Sun Dec 22 21:23:57 1996 David L. Levine <levine@cs.wustl.edu>
* ace/Acceptor.cpp: replaced two statements that looked like this:
@@ -17,6 +30,7 @@ Sun Dec 22 21:16:23 1996 Douglas C. Schmidt <schmidt@mambo.cs.wustl.edu>
* ace/OS.cpp (thr_create): added a new ACE_HAS_PTHREADS_XAVIER to
deal with the sparam.sched_priority features of the Linux
pthreads implementation. Thanks to James Johnson for this.
+>>>>>>> 4.124
* ace/OS.i (thr_setprio): I forgot to define int policy = 0;
diff --git a/README b/README
index 3bc7ead6930..756747c5f20 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-[An HTML version of this README file is available at the following URL
+[This document is also available at the following URL:
http://www.cs.wustl.edu/~schmidt/ACE.html.
@@ -681,3 +681,4 @@ developing distributed application frameworks.
Finally, I'd also like to thank Todd L. Montgomery
<tmont@cerc.wvu.edu>, fellow heavy metal head, for fulfilling his
quest to get ACE to compile with GCC!
+
diff --git a/examples/Threads/task_three.cpp b/examples/Threads/task_three.cpp
index 4b365aba8a5..08e5c0adb0c 100644
--- a/examples/Threads/task_three.cpp
+++ b/examples/Threads/task_three.cpp
@@ -174,7 +174,7 @@ main (int argc, char **)
}
// Register a signal handler.
- ACE_Sig_Action sa (ACE_SignalHandler (handler), SIGINT);
+ ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
ACE_Reactor *reactor1 = ACE_Service_Config::reactor ();
ACE_Reactor *reactor2 = new ACE_Reactor ();