Merged nitro-extreme branch into trunk.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@46598 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/runtime/JSNumberCell.cpp b/JavaScriptCore/runtime/JSNumberCell.cpp
index 669440b..0654da7 100644
--- a/JavaScriptCore/runtime/JSNumberCell.cpp
+++ b/JavaScriptCore/runtime/JSNumberCell.cpp
@@ -23,13 +23,13 @@
#include "config.h"
#include "JSNumberCell.h"
+#if USE(JSVALUE32)
+
#include "NumberObject.h"
#include "UString.h"
namespace JSC {
-#if !USE(ALTERNATE_JSIMMEDIATE)
-
JSValue JSNumberCell::toPrimitive(ExecState*, PreferredPrimitiveType) const
{
return const_cast<JSNumberCell*>(this);
@@ -82,22 +82,6 @@
return uint32 == m_value;
}
-bool JSNumberCell::getTruncatedInt32(int32_t& int32) const
-{
- if (!(m_value >= -2147483648.0 && m_value < 2147483648.0))
- return false;
- int32 = static_cast<int32_t>(m_value);
- return true;
-}
-
-bool JSNumberCell::getTruncatedUInt32(uint32_t& uint32) const
-{
- if (!(m_value >= 0.0 && m_value < 4294967296.0))
- return false;
- uint32 = static_cast<uint32_t>(m_value);
- return true;
-}
-
JSValue JSNumberCell::getJSNumber()
{
return this;
@@ -113,12 +97,14 @@
return new (globalData) JSNumberCell(globalData, d);
}
-JSValue jsAPIMangledNumber(ExecState* exec, double d)
-{
- return new (exec) JSNumberCell(JSNumberCell::APIMangled, d);
-}
+} // namespace JSC
-#else
+#else // USE(JSVALUE32)
+
+// Keep our exported symbols lists happy.
+namespace JSC {
+
+JSValue jsNumberCell(ExecState*, double);
JSValue jsNumberCell(ExecState*, double)
{
@@ -126,12 +112,6 @@
return JSValue();
}
-JSValue jsAPIMangledNumber(ExecState*, double)
-{
- ASSERT_NOT_REACHED();
- return JSValue();
-}
-
-#endif
-
} // namespace JSC
+
+#endif // USE(JSVALUE32)
