Changeset 27198 in webkit for trunk/JavaScriptCore/kjs/SymbolTable.h

Timestamp:

Oct 28, 2007, 6:56:05 PM (18 years ago)

Author:

[email protected]

Message:

2007-10-28 Mark Rowe <​[email protected]>

Reviewed by Maciej.

Fix "AllInOneFile.o has a global initializer in it".

Some versions of gcc generate a global initializer for std::numeric_limits<size_t>::max().
We can avoid this by moving it inside an inline function.

• kjs/SymbolTable.h: (KJS::missingSymbolMarker):
• kjs/function.cpp: (KJS::ActivationImp::getOwnPropertySlot): (KJS::ActivationImp::put):

File:

• trunk/JavaScriptCore/kjs/SymbolTable.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/SymbolTable.h

@@ -31 +31 @@
 
 #include "property_map.h"
+#include "AlwaysInline.h"
 
 namespace KJS {
@@ -42 +43 @@
     };
 
-    static const size_t missingSymbolMarker = std::numeric_limits<size_t>::max();
+    static ALWAYS_INLINE size_t missingSymbolMarker() { return std::numeric_limits<size_t>::max(); }
 
     struct SymbolTableIndexHashTraits {
         typedef size_t TraitType;
         typedef SymbolTableIndexHashTraits StorageTraits;
-        static size_t emptyValue() { return missingSymbolMarker; }
+        static size_t emptyValue() { return missingSymbolMarker(); }
         static const bool emptyValueIsZero = false;
         static const bool needsDestruction = false;