diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-10-04 17:29:42 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-10-04 17:29:42 +0000 |
| commit | 9765f9f535913cd0d73a270f8c2271ecb43ba3a1 (patch) | |
| tree | 3a080708764b35746fa00b08da8bd85541feb7f7 | |
| parent | 9f535c225adfa5ed49d9d30746fc6673c3f60c79 (diff) | |
| download | ATCD-9765f9f535913cd0d73a270f8c2271ecb43ba3a1.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-97b | 10 | ||||
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | apps/Orbix-Examples/Event_Comm/Consumer/Makefile | 4 | ||||
| -rw-r--r-- | apps/Orbix-Examples/Event_Comm/Supplier/Makefile | 4 | ||||
| -rw-r--r-- | examples/Connection/non_blocking/CPP-connector.cpp | 4 |
5 files changed, 14 insertions, 9 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index 6b691161f30..500332528de 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,5 +1,15 @@ Sat Oct 4 11:57:25 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu> + * apps/Orbix-Examples/Event_Comm/{Supplier,Consumer}/Makefile: + Changed a typo where /src/ was being used instead of /libsrc/. + Thanks to Jean-Marc STRAUSS <strauss@objectif.fr> for reporting + this. + + * examples/Connection/non_blocking/CPP-connector.cpp (init): + Removed the initialization of the local address. This is + error-prone and confusing to use. Thanks to Huiying Shen + <shen@environ.org> for reporting this. + * ace/SV_Semaphore_Simple: Added support for IPC_EXCL in order to determine, upon creating the semaphore, if it already exists (which means a bad key was selected), another daemon is still @@ -448,6 +448,7 @@ Vladimir Schipunov <vlad@staff.prodigy.com> Felix Popp <fxpopp@immd9.informatik.uni-erlangen.de> Billy Quinn <bquinn@lads.com> Michael McKnight <mcknight@signalsoftcorp.com> +Huiying Shen <shen@environ.org> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson and is now at ObjectSpace. Paul devised the recursive diff --git a/apps/Orbix-Examples/Event_Comm/Consumer/Makefile b/apps/Orbix-Examples/Event_Comm/Consumer/Makefile index 6816bfa0bbb..23f9da9c5e3 100644 --- a/apps/Orbix-Examples/Event_Comm/Consumer/Makefile +++ b/apps/Orbix-Examples/Event_Comm/Consumer/Makefile @@ -17,9 +17,7 @@ LSRC = $(addsuffix .cpp,$(FILES)) consumer.cpp LOBJ = $(addsuffix .o,$(FILES)) SHOBJ = $(addsuffix .so,$(FILES)) -SRX = ../src/.obj - -LDLIBS = $(addprefix $(VSHDIR),$(LOBJ)) ../src/libEvent_Comm.a +LDLIBS = $(addprefix $(VSHDIR),$(LOBJ)) ../libsrc/libEvent_Comm.a VLDLIBS = $(LDLIBS:%=%$(VAR)) BUILD = $(VBIN) diff --git a/apps/Orbix-Examples/Event_Comm/Supplier/Makefile b/apps/Orbix-Examples/Event_Comm/Supplier/Makefile index e892aa43e8f..85eed3c8d4e 100644 --- a/apps/Orbix-Examples/Event_Comm/Supplier/Makefile +++ b/apps/Orbix-Examples/Event_Comm/Supplier/Makefile @@ -17,9 +17,7 @@ LSRC = $(addsuffix .cpp,$(FILES)) supplier.cpp LOBJ = $(addsuffix .o,$(FILES)) SHOBJ = $(addsuffix .so,$(FILES)) -SRX = ../src/.obj - -LDLIBS = $(addprefix $(VSHDIR),$(LOBJ)) ../src/libEvent_Comm.a +LDLIBS = $(addprefix $(VSHDIR),$(LOBJ)) ../libsrc/libEvent_Comm.a VLDLIBS = $(LDLIBS:%=%$(VAR)) diff --git a/examples/Connection/non_blocking/CPP-connector.cpp b/examples/Connection/non_blocking/CPP-connector.cpp index 03b75f063c5..b3e00c62c9d 100644 --- a/examples/Connection/non_blocking/CPP-connector.cpp +++ b/examples/Connection/non_blocking/CPP-connector.cpp @@ -181,7 +181,6 @@ IPC_Client<SH, PR_CO_2>::init (int argc, char *argv[]) ACE_Time_Value timeout (argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_TIMEOUT); - char *l_addr = argc > 3 ? argv[3] : ACE_DEFAULT_LOCAL_PORT_STR; // Handle signals through the ACE_Reactor. if (ACE_Reactor::instance ()->register_handler @@ -189,7 +188,6 @@ IPC_Client<SH, PR_CO_2>::init (int argc, char *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_handler"), -1); PR_AD remote_addr (r_addr); - PR_AD local_addr (l_addr); this->options_.set (ACE_Synch_Options::USE_REACTOR, timeout); @@ -198,7 +196,7 @@ IPC_Client<SH, PR_CO_2>::init (int argc, char *argv[]) ACE_NEW_RETURN (sh, SH (this->reactor ()), -1); // Connect to the peer, reusing the local addr if necessary. - if (this->connect (sh, remote_addr, this->options_, local_addr, 1) == -1 + if (this->connect (sh, remote_addr, this->options_) == -1 && errno != EWOULDBLOCK) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "connect"), -1); else |