aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/text_format.cc
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2015-06-17 13:12:11 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2015-06-17 13:12:11 -0700
commite9a122eb19ec54dbca15da80355ed0c17cada9b1 (patch)
treefac37489873ccf47777b2e652db580f9315d7bc7 /src/google/protobuf/text_format.cc
parentb36395b2bac88f70070544c325bc09234cb1f1a6 (diff)
parent818c5eee08840355d70d2f3bdf1a2f17986a5e70 (diff)
downloadprotobuf-e9a122eb19ec54dbca15da80355ed0c17cada9b1.tar.gz
protobuf-e9a122eb19ec54dbca15da80355ed0c17cada9b1.tar.bz2
protobuf-e9a122eb19ec54dbca15da80355ed0c17cada9b1.zip
Merge pull request #501 from xfxyjwf/down
Down-integrate from internal code base.
Diffstat (limited to 'src/google/protobuf/text_format.cc')
-rw-r--r--src/google/protobuf/text_format.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/text_format.cc b/src/google/protobuf/text_format.cc
index 61dfa5d6..4d8c1f91 100644
--- a/src/google/protobuf/text_format.cc
+++ b/src/google/protobuf/text_format.cc
@@ -1880,7 +1880,7 @@ void TextFormat::Printer::PrintUnknownFields(
generator.Print(field_number);
generator.Print(": 0x");
generator.Print(
- StrCat(strings::Hex(field.fixed32(), strings::Hex::ZERO_PAD_8)));
+ StrCat(strings::Hex(field.fixed32(), strings::ZERO_PAD_8)));
if (single_line_mode_) {
generator.Print(" ");
} else {
@@ -1892,7 +1892,7 @@ void TextFormat::Printer::PrintUnknownFields(
generator.Print(field_number);
generator.Print(": 0x");
generator.Print(
- StrCat(strings::Hex(field.fixed64(), strings::Hex::ZERO_PAD_16)));
+ StrCat(strings::Hex(field.fixed64(), strings::ZERO_PAD_16)));
if (single_line_mode_) {
generator.Print(" ");
} else {