Changeset 14728 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Jun 4, 2006, 3:51:57 PM (19 years ago)

Author:

darin

Message:

Reviewed by Anders.

• changed deleteAllValues so it can work on "const" collections Deleting the values affects the values, not the pointers in the collection, so it's legitimate to do it to a const collection, and a case of that actually came up in the XPath code.

• wtf/HashMap.h: (WTF::deleteAllPairSeconds): Use const iterators. (WTF::deleteAllValues): Take const HashMap reference as a parameter.
• wtf/HashSet.h: (WTF::deleteAllValues): Take const HashSet reference as a parameter, and use const iterators.
• wtf/Vector.h: (WTF::deleteAllValues): Take const Vector reference as a parameter.

• added more functions that are present in <math.h> on some platforms, but not on others; moved here from various files in WebCore

• wtf/MathExtras.h: (isinf): Added. (isnan): Added. (lround): Added. (lroundf): Tweaked. (round): Added. (roundf): Tweaked. (signbit): Added.

Location:

trunk/JavaScriptCore/wtf

Files:

• HashMap.h (modified) (2 diffs)
• HashSet.h (modified) (4 diffs)
• MathExtras.h (modified) (1 diff)
• Vector.h (modified) (1 diff)

trunk/JavaScriptCore/wtf/HashMap.h

@@ -309 +309 @@
     void deleteAllPairSeconds(HashTableType& collection)
     {
-        typedef typename HashTableType::iterator iterator;
+        typedef typename HashTableType::const_iterator iterator;
         iterator end = collection.end();
         for (iterator it = collection.begin(); it != end; ++it)
@@ -316 +316 @@
 
     template<typename T, typename U, typename V, typename W, typename X>
-    inline void deleteAllValues(HashMap<T, U, V, W, X>& collection)
+    inline void deleteAllValues(const HashMap<T, U, V, W, X>& collection)
     {
         deleteAllPairSeconds<typename HashMap<T, U, V, W, X>::MappedType>(collection);

trunk/JavaScriptCore/wtf/HashSet.h

@@ -33 +33 @@
     template<typename Value, typename HashFunctions, typename Traits> class HashSet;
     template<typename Value, typename HashFunctions, typename Traits>
-    void deleteAllValues(HashSet<Value, HashFunctions, Traits>&);
+    void deleteAllValues(const HashSet<Value, HashFunctions, Traits>&);
 
     template<typename ValueArg, typename HashArg = typename DefaultHash<ValueArg>::Hash,
@@ -92 +92 @@
         void derefAll();
 
-        friend void deleteAllValues<>(HashSet&);
+        friend void deleteAllValues<>(const HashSet&);
 
         HashTableType m_impl;
@@ -295 +295 @@
     void deleteAllValues(HashTableType& collection)
     {
-        typedef typename HashTableType::iterator iterator;
+        typedef typename HashTableType::const_iterator iterator;
         iterator end = collection.end();
         for (iterator it = collection.begin(); it != end; ++it)
@@ -302 +302 @@
 
     template<typename T, typename U, typename V>
-    inline void deleteAllValues(HashSet<T, U, V>& collection)
+    inline void deleteAllValues(const HashSet<T, U, V>& collection)
     {
         deleteAllValues<typename HashSet<T, U, V>::ValueType>(collection.m_impl);

trunk/JavaScriptCore/wtf/MathExtras.h

@@ -28 +28 @@
 #if PLATFORM(WIN)
 
-inline float roundf(float num)
-{
-    return num > 0 ? floorf(num + 0.5f) : ceilf(num - 0.5f);
-}
+#include <xmath.h>
 
-inline long lroundf(float num)
-{
-    return num > 0 ? num + 0.5f : ceilf(num - 0.5f);
-}
+inline bool isinf(double num) { return !_finite(num); }
+inline bool isnan(double num) { return _isnan(num); }
+inline long lround(double num) { return num > 0 ? num + 0.5 : ceil(num - 0.5); }
+inline long lroundf(float num) { return num > 0 ? num + 0.5f : ceilf(num - 0.5f); }
+inline double round(double num) { return num > 0 ? floor(num + 0.5) : ceil(num - 0.5); }
+inline float roundf(float num) { return num > 0 ? floorf(num + 0.5f) : ceilf(num - 0.5f); }
+inline bool signbit(double num) { return _copysign(1.0, num) < 0; }
 
 #endif

trunk/JavaScriptCore/wtf/Vector.h

@@ -580 +580 @@
 
     template<typename T, size_t inlineCapacity>
-    void deleteAllValues(Vector<T, inlineCapacity>& collection)
-    {
-        typedef Vector<T, inlineCapacity> Vec;
-        typename Vec::iterator end = collection.end();
-        for (typename Vec::iterator it = collection.begin(); it != end; ++it)
+    void deleteAllValues(const Vector<T, inlineCapacity>& collection)
+    {
+        typedef typename Vector<T, inlineCapacity>::const_iterator iterator;
+        iterator end = collection.end();
+        for (iterator it = collection.begin(); it != end; ++it)
             delete *it;
     }