JavaScriptCore-7600.1.4.17.5.tar.gz

[apple/javascriptcore.git] / runtime / DateInstanceCache.h

diff --git a/runtime/DateInstanceCache.h b/runtime/DateInstanceCache.h
index d208580a34ebd5e639eb6b1fde3cabb780650bf4..07053062eeabcdf5878ca0b585f94f6b4c04d39f 100644 (file)
--- a/runtime/DateInstanceCache.h
+++ b/runtime/DateInstanceCache.h
@@ -26,15 +26,15 @@
 #ifndef DateInstanceCache_h
 #define DateInstanceCache_h
 
-#include <wtf/DateMath.h>
+#include "JSCJSValue.h"
+#include "JSDateMath.h"
+#include <array>
 #include <wtf/HashFunctions.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
 namespace JSC {
 
-    extern const double NaN;
-
     class DateInstanceData : public RefCounted<DateInstanceData> {
     public:
         static PassRefPtr<DateInstanceData> create() { return adoptRef(new DateInstanceData); }
@@ -46,8 +46,8 @@ namespace JSC {
 
     private:
         DateInstanceData()
-            : m_gregorianDateTimeCachedForMS(NaN)
-            , m_gregorianDateTimeUTCCachedForMS(NaN)
+            : m_gregorianDateTimeCachedForMS(PNaN)
+            , m_gregorianDateTimeUTCCachedForMS(PNaN)
         {
         }
     };
@@ -62,7 +62,7 @@ namespace JSC {
         void reset()
         {
             for (size_t i = 0; i < cacheSize; ++i)
-                m_cache[i].key = NaN;
+                m_cache[i].key = PNaN;
         }
         
         DateInstanceData* add(double d)
@@ -86,7 +86,7 @@ namespace JSC {
 
         CacheEntry& lookup(double d) { return m_cache[WTF::FloatHash<double>::hash(d) & (cacheSize - 1)]; }
 
-        CacheEntry m_cache[cacheSize];
+        std::array<CacheEntry, cacheSize> m_cache;
     };
 
 } // namespace JSC