base/json/json_reader.cc - Issue 3056029: Move the number conversions from string_util to a new file....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/json/json_reader.cc

Issue 3056029: Move the number conversions from string_util to a new file.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 10 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: base/json/json_reader.cc

===================================================================

--- base/json/json_reader.cc (revision 54340)

+++ base/json/json_reader.cc (working copy)

@@ -7,6 +7,7 @@

#include "base/float_util.h"

#include "base/logging.h"

#include "base/scoped_ptr.h"

+#include "base/string_number_conversions.h"

#include "base/string_util.h"

#include "base/utf_string_conversions.h"

#include "base/values.h"

@@ -401,11 +402,11 @@

const std::wstring num_string(token.begin, token.length);

int num_int;

- if (StringToInt(WideToUTF16Hack(num_string), &num_int))

+ if (StringToInt(WideToUTF8(num_string), &num_int))

return Value::CreateIntegerValue(num_int);

double num_double;

- if (StringToDouble(WideToUTF16Hack(num_string), &num_double) &&

+ if (StringToDouble(WideToUTF8(num_string), &num_double) &&

base::IsFinite(num_double))

return Value::CreateRealValue(num_double);

« no previous file with comments | « base/file_util_win.cc ('k') | base/json/json_writer.cc » ('j') | no next file with comments »