*** empty log message ***

3 files changed, 6 insertions, 8 deletions

diff --git a/README b/README
index 2cfe2f89865..d3e9ecb5efe 100644
--- a/README
+++ b/README
@@ -40,10 +40,10 @@ automates system configuration and reconfiguration by dynamically
 linking services into applications at run-time and executing these
 services in one or more processes or threads.
 
-ACE is currently used in commercial products by dozens of companies
-including Ericsson, Bellcore, Siemens, Motorola, Kodak, Boeing,
-Lucent, DEC, Lockheed Martin, and SAIC.  Commercial support for ACE is
-available at http://www.riverace.com.
+ACE is currently used in commercial projects and products by dozens of
+companies including Ericsson, Bellcore, Siemens, Motorola, Kodak,
+Boeing, Lucent, DEC, Lockheed Martin, and SAIC.  Commercial support
+for ACE is available at http://www.riverace.com.
 
 ----------------------------------------
 
diff --git a/ace/OS.i b/ace/OS.i
index ba7f5559299..5a9662aaa25 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -1771,10 +1771,9 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
 #if defined (ACE_HAS_THREADS)
   int result;
   timespec_t ts;
+
   if (timeout != 0)
-    {
-      ts = *timeout; // Calls ACE_Time_Value::operator timespec_t().
-    }
+    ts = *timeout; // Calls ACE_Time_Value::operator timespec_t().
 
 #if (defined (ACE_HAS_DCETHREADS) || defined (ACE_HAS_PTHREADS)) && !defined (ACE_HAS_FSU_PTHREADS)
 #  if defined (ACE_HAS_DCE_DRAFT4_THREADS)
diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp
index e46102f6559..8c187769a78 100644
--- a/tests/Future_Test.cpp
+++ b/tests/Future_Test.cpp
@@ -47,7 +47,6 @@ class Scheduler : public ACE_Task<ACE_MT_SYNCH>
   // = TITLE
   //     Active Object Scheduler.
 {
-  friend class Method_ObjectWork;
 public:
   Scheduler (const char *, Scheduler * = 0);
   virtual ~Scheduler (void);