Fix after merge.

src/double-conversion.cc

diff --git a/src/double-conversion.cc b/src/double-conversion.cc
index d2893f5..1a9767b 100644
--- a/src/double-conversion.cc
+++ b/src/double-conversion.cc
@@ -921,7 +921,7 @@
 double StringToDoubleConverter::StringToDouble(
     const char* buffer,
     int length,
-    int* processed_characters_count) {
+    int* processed_characters_count) const {
   return StringToIeee(buffer, length, true, processed_characters_count);
 }
 
@@ -929,22 +929,24 @@
 double StringToDoubleConverter::StringToDouble(
     const uc16* buffer,
     int length,
-    int* processed_characters_count) {
+    int* processed_characters_count) const {
   return StringToIeee(buffer, length, true, processed_characters_count);
 }
 
 
-float StringToDoubleConverter::StringToFloat(const char* buffer,
-                                             int length,
-                                             int* processed_characters_count) {
+float StringToDoubleConverter::StringToFloat(
+    const char* buffer,
+    int length,
+    int* processed_characters_count) const {
   return static_cast<float>(StringToIeee(buffer, length, false,
                                          processed_characters_count));
 }
 
 
-float StringToDoubleConverter::StringToFloat(const uc16* buffer,
-                                             int length,
-                                             int* processed_characters_count) {
+float StringToDoubleConverter::StringToFloat(
+    const uc16* buffer,
+    int length,
+    int* processed_characters_count) const {
   return static_cast<float>(StringToIeee(buffer, length, false,
                                          processed_characters_count));
 }

src/double-conversion.h

diff --git a/src/double-conversion.h b/src/double-conversion.h
index 7bc58ba..6bdfa8d 100644
--- a/src/double-conversion.h
+++ b/src/double-conversion.h
@@ -508,7 +508,7 @@
   // Same as StringToDouble above but for 16 bit characters.
   double StringToDouble(const uc16* buffer,
                         int length,
-                        int* processed_characters_count);
+                        int* processed_characters_count) const;
 
   // Same as StringToDouble but reads a float.
   // Note that this is not equivalent to static_cast<float>(StringToDouble(...))
@@ -520,7 +520,7 @@
   // Same as StringToFloat above but for 16 bit characters.
   float StringToFloat(const uc16* buffer,
                       int length,
-                      int* processed_characters_count);
+                      int* processed_characters_count) const;
 
  private:
   const int flags_;