ChangeLogTag:Sat Jul 06 19:32:40 2002 Balachandran Natarajan <bala@cs.wustl.edu>

5 files changed, 45 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index efc764e2932..452637bc435 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sat Jul 06 19:32:40 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* ace/Time_Value.h (ACE_Time_Value): Fix for [BUGID 1240]. Some of
+	  the operators were missing explicit declarations in the header
+	  file (they were anyway defined in the inlined files) which
+	  created problems in builds where inlining was diabled. Please
+	  see 
+
+	  http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1240 for
+	  more details. Thanks to Marina Spivak <marina@atdesk.com> for
+	  reporting this.
+
 Fri Jul  5 18:44:39 2002  Steve Huston  <shuston@riverace.com>
 
         * ace/ACE.cpp: Corrected undeclared 'select_width' errors and
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index efc764e2932..452637bc435 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,15 @@
+Sat Jul 06 19:32:40 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* ace/Time_Value.h (ACE_Time_Value): Fix for [BUGID 1240]. Some of
+	  the operators were missing explicit declarations in the header
+	  file (they were anyway defined in the inlined files) which
+	  created problems in builds where inlining was diabled. Please
+	  see 
+
+	  http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1240 for
+	  more details. Thanks to Marina Spivak <marina@atdesk.com> for
+	  reporting this.
+
 Fri Jul  5 18:44:39 2002  Steve Huston  <shuston@riverace.com>
 
         * ace/ACE.cpp: Corrected undeclared 'select_width' errors and
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index efc764e2932..452637bc435 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,15 @@
+Sat Jul 06 19:32:40 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* ace/Time_Value.h (ACE_Time_Value): Fix for [BUGID 1240]. Some of
+	  the operators were missing explicit declarations in the header
+	  file (they were anyway defined in the inlined files) which
+	  created problems in builds where inlining was diabled. Please
+	  see 
+
+	  http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1240 for
+	  more details. Thanks to Marina Spivak <marina@atdesk.com> for
+	  reporting this.
+
 Fri Jul  5 18:44:39 2002  Steve Huston  <shuston@riverace.com>
 
         * ace/ACE.cpp: Corrected undeclared 'select_width' errors and
diff --git a/ace/Time_Value.h b/ace/Time_Value.h
index 23d33c93cfa..97d82ca67ee 100644
--- a/ace/Time_Value.h
+++ b/ace/Time_Value.h
@@ -238,6 +238,13 @@ public:
   friend ACE_OS_Export int operator != (const ACE_Time_Value &tv1,
                                         const ACE_Time_Value &tv2);
 
+  /// Multiplies the time value by <d>
+  friend ACE_OS_Export ACE_Time_Value operator * (double d,
+                                                  const ACE_Time_Value &tv);
+
+  friend ACE_OS_Export ACE_Time_Value operator * (const ACE_Time_Value &tv,
+                                                  double d);
+
   /// Dump is a no-op.
   /**
    * The dump() method is a no-op.  It's here for backwards compatibility
diff --git a/ace/Time_Value.inl b/ace/Time_Value.inl
index c70461c0a91..1518b139e0e 100644
--- a/ace/Time_Value.inl
+++ b/ace/Time_Value.inl
@@ -165,7 +165,8 @@ ACE_Time_Value::ACE_Time_Value (const ACE_Time_Value &tv)
 ACE_INLINE ACE_Time_Value &
 ACE_Time_Value::operator *= (double d)
 {
-  double time = ((double) this->sec ()) * ACE_ONE_SECOND_IN_USECS + this->usec ();
+  double time =
+    ((double) this->sec ()) * ACE_ONE_SECOND_IN_USECS + this->usec ();
   time *= d;
   this->sec ((long)(time / ACE_ONE_SECOND_IN_USECS));
   this->usec (((long)time) % ACE_ONE_SECOND_IN_USECS);