Rubber stamped by Mark.

        - avoid using non-portable SIZE_T_MAX in favor of std::numeric_limits

        * kjs/SymbolTable.h:
        (KJS::SymbolTableIndexHashTraits::emptyValue):
        * kjs/function.cpp:
        (KJS::ActivationImp::getOwnPropertySlot):
        (KJS::ActivationImp::put):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27178 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 103bcd1176627979c7124f59a272a3472d80d310..c27e0e5d5c6bb58c1c5dc01d042714b061ad1a91 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2007-10-28  Maciej Stachowiak  <mjs@apple.com>
+
+        Rubber stamped by Mark.
+        
+        - avoid using non-portable SIZE_T_MAX in favor of std::numeric_limits
+
+        * kjs/SymbolTable.h:
+        (KJS::SymbolTableIndexHashTraits::emptyValue):
+        * kjs/function.cpp:
+        (KJS::ActivationImp::getOwnPropertySlot):
+        (KJS::ActivationImp::put):
+
 2007-10-28  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Eric.

diff --git a/JavaScriptCore/kjs/SymbolTable.h b/JavaScriptCore/kjs/SymbolTable.h
index fb7df2a6cdd2f849a9bbb39266b5e79e5ee4fd25..a0b6015f2b60597e8e0c976158eea2f59e078fe0 100644 (file)
--- a/JavaScriptCore/kjs/SymbolTable.h
+++ b/JavaScriptCore/kjs/SymbolTable.h
@@ -41,10 +41,12 @@ namespace KJS {
         static const bool safeToCompareToEmptyOrDeleted = true;
     };
 
+    static const size_t missingSymbolMarker = std::numeric_limits<size_t>::max();
+
     struct SymbolTableIndexHashTraits {
         typedef size_t TraitType;
         typedef SymbolTableIndexHashTraits StorageTraits;
-        static size_t emptyValue() { return SIZE_T_MAX; }
+        static size_t emptyValue() { return missingSymbolMarker; }
         static const bool emptyValueIsZero = false;
         static const bool needsDestruction = false;
         static const bool needsRef = false;

diff --git a/JavaScriptCore/kjs/function.cpp b/JavaScriptCore/kjs/function.cpp
index 23ccde36dd012498dc2be154cb55cd4c001e65dd..e714412d39d161465933044d888bd089102fffa6 100644 (file)
--- a/JavaScriptCore/kjs/function.cpp
+++ b/JavaScriptCore/kjs/function.cpp
@@ -421,9 +421,9 @@ bool ActivationImp::getOwnPropertySlot(ExecState* exec, const Identifier& proper
     ASSERT(!_prop.hasGetterSetterProperties());
 
     // it's more efficient to just get and check for a special empty
-    // value of SIZE_T_MAX than to do a separate contains check
+    // value than to do a separate contains check
     size_t index = symbolTable->get(propertyName.ustring().rep());
-    if (index != SIZE_T_MAX) {
+    if (index != missingSymbolMarker) {
         slot.setValueSlot(this, &d->localStorage[index].value);
         return true;
     }
@@ -460,9 +460,9 @@ void ActivationImp::put(ExecState*, const Identifier& propertyName, JSValue* val
   ASSERT(prototype() == jsNull());
 
   // it's more efficient to just get and check for a special empty
-  // value of SIZE_T_MAX than to do a separate contains check
+  // value than to do a separate contains check
   size_t index = symbolTable->get(propertyName.ustring().rep());
-  if (index != SIZE_T_MAX) {
+  if (index != missingSymbolMarker) {
     LocalStorageEntry& entry = d->localStorage[index];
     entry.value = value;
     entry.attributes = attr;