diff options
| author |  kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-07-29 01:13:20 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-07-29 01:13:20 +0000 |
| commit | 80b1d62bfcea65c59e2160da71dad84b1bd19cef (patch) | |
| tree | 5423b830c53174fec83a7ea01ff0877e11c1ddb6 /src/google/protobuf/io/tokenizer.cc | |
| parent | d2fd0638c309113ccae3731a58e30419f522269a (diff) | |
Submit recent changes from internal branch, including "lite mode" for
C++ and Java. See CHANGES.txt for more details.
Diffstat (limited to 'src/google/protobuf/io/tokenizer.cc')
| -rw-r--r-- | src/google/protobuf/io/tokenizer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/io/tokenizer.cc b/src/google/protobuf/io/tokenizer.cc index 4823912a..0bda451b 100644 --- a/src/google/protobuf/io/tokenizer.cc +++ b/src/google/protobuf/io/tokenizer.cc @@ -571,7 +571,7 @@ bool Tokenizer::ParseInteger(const string& text, uint64 max_value, const char* ptr = text.c_str(); int base = 10; if (ptr[0] == '0') { - if (ptr[1] == 'x') { + if (ptr[1] == 'x' || ptr[1] == 'X') { // This is hex. base = 16; ptr += 2; |