Fix build (someone tell gcc you can't take the address of a static

const int and someone tell MSVC it's OK to define a static const int
in a .cc file).
Review URL: http://codereview.chromium.org/13656

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@942 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/jsregexp.cc b/src/jsregexp.cc
index b60b1a62e01230c87e90b6098d069294c9db8151..d44b5afceaa9ae46066f7da216b5be3dd526d3a2 100644 (file)
--- a/src/jsregexp.cc
+++ b/src/jsregexp.cc
@@ -1715,9 +1715,12 @@ static void EmitCharClass(RegExpMacroAssembler* macro_assembler,
                           bool check_offset,
                           bool ascii) {
   ZoneList<CharacterRange>* ranges = cc->ranges();
-  const int max_char = ascii ?
-                       String::kMaxAsciiCharCode :
-                       String::kMaxUC16CharCode;
+  int max_char;
+  if (ascii) {
+    max_char = String::kMaxAsciiCharCode;
+  } else {
+    max_char = String::kMaxUC16CharCode;
+  }
 
   Label success;
 

diff --git a/src/objects.cc b/src/objects.cc
index 51a2ea3988d6644978376217193758507556a4cb..edc5a0d03c86afcd4d03f9863b9cd236d597ac43 100644 (file)
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -48,9 +48,6 @@ namespace v8 { namespace internal {
 const int kGetterIndex = 0;
 const int kSetterIndex = 1;
 
-const int String::kMaxAsciiCharCode;
-const int String::kMaxUC16CharCode;
-
 bool Object::IsInstanceOf(FunctionTemplateInfo* expected) {
   // There is a constraint on the object; check
   if (!this->IsJSObject()) return false;