ChangeLogTag:Tue

4 files changed, 25 insertions, 19 deletions

diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index 5c3fdd59458..f7ddc3bf5c7 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -227,13 +227,16 @@ supported by the DOC group, Riverace, OCI or Remedy IT. </p><p>
 
 </p><p></p><hr><p>
 </p><h2><a name="installpre">Installation prerequisites</a></h2>
-<p>
-ACE (as well as TAO and CIAO) use MPC (MakeProjectCreator) to generate
-files used by all supported build tools (such as GNUmakefiles for UNIX based
-platforms, sln and vcproj files for VC71/VC8 and CodeGear makefiles) on various
-platforms. To help new users to bootstrap quickly the release bundles
-of ACE (as well as TAO and CIAO) include all needed files to use the build
+
+<p> ACE (as well as TAO and CIAO) use <A
+HREF="http://downloads.ociweb.com/MPC/docs/html/MakeProjectCreator.html">MPC</A>
+(MakeProjectCreator) to generate files used by all supported build
+tools (such as GNUmakefiles for UNIX based platforms, sln and vcproj
+files for VC71/VC8 and CodeGear makefiles) on various platforms. To
+help new users to bootstrap quickly the release bundles of ACE (as
+well as TAO and CIAO) include all needed files to use the build
 instructions in this document.
+
 </p>
 <p>
 If it is necessary to generate
@@ -2612,12 +2615,14 @@ well, try 'make realclean'.</p><p>
 <p></p><hr><p>
 </p><h1><a name="MPC">General MPC information</a></h1>
 
-The Makefile Project Creator (MPC) is a tool that takes platform and
+The <A HREF="
+http://downloads.ociweb.com/MPC/docs/html/MakeProjectCreator.html</A>
+Makefile Project Creator (MPC)</A> is a tool that takes platform and
 building tool generic files (mpc files) as input, which describe basic
 information needed to generate a "project" file for various build
 tools, including Make, NMake, Visual C++ 6, Visual C++ 7, etc.  Please
-see <a href="MPC/docs/USAGE">USAGE</a>, <a href="MPC/docs/README">README</a> for
-documentation on MPC.<P>
+see <a href="MPC/docs/USAGE">USAGE</a>, <a
+href="MPC/docs/README">README</a> for documentation on MPC.<P>
 
 A common usage for creating a Windows workspace containing just the
 core ACE and TAO libraries and executables is the following:
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index b1587be587a..9f966f26758 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Tue Apr  6 14:37:38 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ACE-INSTALL.html (http): Updated the link to the OCI MPC
+          website.  Thanks to Tim <tim at burmair dot com> for suggesting
+          this.
+
 Wed Apr  7 07:06:31 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/MakeProjectCreator/config/global.features:
diff --git a/ACE/THANKS b/ACE/THANKS
index 9b15b17d2f3..bcda25b0c57 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -168,7 +168,7 @@ Jean-Francois Ripouteau <Jean-Francois dot Ripouteau at netsurf dot org>
 Ajit Sagar <asagar at spdmail dot spd dot dsccc dot com>
 Ashish Singhai <singhai at delirius dot cs dot uiuc dot edu>
 David Sames <David dot L dot Sames dot 1 at gsfc dot nasa dot gov>
-Gonzalo Diethelm <gonzalo dot diethelm at aditiva dot com>
+Gonzalo Diethelm <gdiethelm at dcv dot cl>
 Raj <raj at itd dot ssb dot com>
 Darrin Edelman <darrin at aetherworks dot com>
 Steve Weismuller <spweismu at rsoc dot rockwell dot com>
@@ -2320,6 +2320,7 @@ Trent Nadeau <Trent dot Nadeau at ngc dot com>
 Nick Meyer <nick dot meyer at sensis dot com>
 Olivier Langlois <olivier at olivierlanglois dot net>
 Patrick Soboljew <patrick dot soboljew at gmail dot com>
+Tim Pinkawa <tpinkawa at eagleseven dot com>
 Ed Blackmond <ed dot blackmond at themis dot com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp
index ccf13c80d3a..edf4ad8e1f1 100644
--- a/ACE/ace/Time_Value.cpp
+++ b/ACE/ace/Time_Value.cpp
@@ -340,21 +340,15 @@ ostream &operator<<(ostream &o, const ACE_Time_Value &v)
     {
       o << tv->tv_sec;
       if (tv->tv_usec)
-        {
-          o << '.' << std::setw (6) << ACE_STD_NAMESPACE::abs (tv->tv_usec);
-        }
+        o << '.' << std::setw (6) << ACE_STD_NAMESPACE::abs (tv->tv_usec);
     }
   else if (tv->tv_usec < 0)
-    {
-      o << "-0." << std::setw (6) << -tv->tv_usec;
-    }
+    o << "-0." << std::setw (6) << - tv->tv_usec;
   else
     {
       o << '0';
       if (tv->tv_usec > 0)
-        {
-          o << '.'<< std::setw (6) << tv->tv_usec;
-        }
+        o << '.'<< std::setw (6) << tv->tv_usec;
     }
 
   o.fill (oldFiller);