summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ACE-INSTALL.html5
-rw-r--r--ACE/ChangeLog12
-rw-r--r--ACE/THANKS3
-rw-r--r--ACE/ace/CDR_Stream.inl1
4 files changed, 19 insertions, 2 deletions
diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index 6228bd39584..e3e9a3b07a5 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -1020,6 +1020,11 @@ setup selects by default:
<blockquote><code></code><pre> % export PATH=//c/cygwin/bin:$PATH
</pre></blockquote>
+ or
+
+ <blockquote><code></code><pre> % export PATH=/cygdrive/c/cygwin/bin:$PATH
+ </pre></blockquote>
+
<p>
Note Cygwin uses ``<tt>/</tt>'' as directory separator,
and ``<tt>//X</tt>'' as a notation for Win32 drive <tt>X</tt>.
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 50b01a7c6ac..33d49296837 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,15 @@
+Wed Jan 21 02:39:42 UTC 2009 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
+
+ * ace/CDR_Stream.inl (current_alignment): Removed an
+ unnecessary/incorrect "return 0;" statement. Thanks to Pan Kai
+ Luna <pan dot kai dot luna at gmail dot com> for reporting this.
+
+Tue Jan 20 22:42:08 UTC 2009 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
+
+ * ACE-INSTALL.html (make): Updated the Cygwin documentation.
+ Thanks to Florent Vial <florent dot vial at gmail dot com> for
+ contributing this.
+
Tue Jan 20 11:04:11 UTC 2009 Marcel Smit <msmit@remedy.nl>
* tests/Bug_3500_Regression_Test.cpp:
diff --git a/ACE/THANKS b/ACE/THANKS
index cbfec26df7d..ca7b4516f7d 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2270,7 +2270,8 @@ Greg Bothe <ace at netrats dot net>
Anand Kumar <anandkumar95 at gmail dot com>
Joe Pallas <pallas at cs dot stanford dot edu>
Marcel Smit <msmit at remedy dot nl>
-Bill Rizzi <rizzi at softserv.com>
+Florent Vial <florent dot vial at gmail dot com>
+Pan Kai Luna <pan dot kai dot luna at gmail dot com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile
diff --git a/ACE/ace/CDR_Stream.inl b/ACE/ace/CDR_Stream.inl
index 5d814aed006..833dcda46ae 100644
--- a/ACE/ace/CDR_Stream.inl
+++ b/ACE/ace/CDR_Stream.inl
@@ -572,7 +572,6 @@ ACE_OutputCDR::current_alignment (size_t current_alignment)
this->current_alignment_ = current_alignment;
#else
ACE_UNUSED_ARG (current_alignment);
- return 0;
#endif /* ACE_LACKS_CDR_ALIGNMENT */
}