Changeset 16786 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 4, 2006, 2:08:43 PM (19 years ago)

Author:

kmccullo

Message:

Reviewed by DethBakin.

• Apparently the build bot uses an older version of XCode which warns about conversions and the newest version does not. I hope this fixes the build but I cann't be sure on my system.

• kjs/DateMath.cpp: (KJS::msToYear): (KJS::dayInYear): (KJS::dateToDayInYear):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/DateMath.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-10-04  Kevin McCullough  <[email protected]>
+
+        Reviewed by DethBakin.
+
+        - Apparently the build bot uses an older version of XCode which warns about conversions and the newest version does not.  I hope this fixes the build but I cann't be sure on my system.
+
+        * kjs/DateMath.cpp:
+        (KJS::msToYear):
+        (KJS::dayInYear):
+        (KJS::dateToDayInYear):
+
 2006-10-05  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/kjs/DateMath.cpp

@@ -114 +114 @@
 }
 
-static inline double msToYear(double ms)
-{
-    double y = floor(ms /(msPerDay*365.2425)) + 1970;
+static inline int msToYear(double ms)
+{
+    int y = static_cast<int>(floor(ms /(msPerDay*365.2425)) + 1970);
     double t2 = msFrom1970ToYear(y);
 
@@ -144 +144 @@
 }
 
-static inline double dayInYear(double ms, int year)
-{
-    return msToDays(ms) - daysFrom1970ToYear(year);
+static inline int dayInYear(double ms, int year)
+{
+    return static_cast<int>(msToDays(ms) - daysFrom1970ToYear(year));
 }
 
@@ -278 +278 @@
 static int dateToDayInYear(int year, int month, int day)
 {
-    year += floor(month / 12);
-
-    month = fmod(month, 12.0);
+    year += static_cast<int>(floor(month / 12));
+
+    month = static_cast<int>(fmod(month, 12.0));
     if (month < 0)
         month += 12;