Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 70d5ec0cbbb0
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c1edd32e5843
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 4, 2017

  1. Add support for fixed32 in the generator.

    @pleroy
    pleroy committed Mar 4, 2017
    Copy the full SHA
    9708d47 View commit details

  2. Merge pull request #1225 from pleroy/Fixed32 

    Add support for fixed32 in the generator.
    @eggrobin
    eggrobin authored Mar 4, 2017
    Copy the full SHA
    c1edd32 View commit details
Showing with 10 additions and 0 deletions.
  1. +9 −0 tools/journal_proto_processor.cpp
  2. +1 −0 tools/journal_proto_processor.hpp
9 changes: 9 additions & 0 deletions tools/journal_proto_processor.cpp
View file
Original file line number Diff line number Diff line change
@@ -313,6 +313,12 @@ void JournalProtoProcessor::ProcessOptionalMessageField(
};
}

void JournalProtoProcessor::ProcessRequiredFixed32Field(
FieldDescriptor const* descriptor) {
field_cs_type_[descriptor] = "uint";
field_cxx_type_[descriptor] = "uint32_t";
}

void JournalProtoProcessor::ProcessRequiredFixed64Field(
FieldDescriptor const* descriptor) {
FieldOptions const& options = descriptor->options();
@@ -535,6 +541,9 @@ void JournalProtoProcessor::ProcessRequiredField(
case FieldDescriptor::TYPE_DOUBLE:
ProcessRequiredDoubleField(descriptor);
break;
case FieldDescriptor::TYPE_FIXED32:
ProcessRequiredFixed32Field(descriptor);
break;
case FieldDescriptor::TYPE_FIXED64:
ProcessRequiredFixed64Field(descriptor);
break;
1 change: 1 addition & 0 deletions tools/journal_proto_processor.hpp
View file
Original file line number Diff line number Diff line change
@@ -49,6 +49,7 @@ class JournalProtoProcessor final {
void ProcessOptionalInt32Field(FieldDescriptor const* descriptor);
void ProcessOptionalMessageField(FieldDescriptor const* descriptor);

void ProcessRequiredFixed32Field(FieldDescriptor const* descriptor);
void ProcessRequiredFixed64Field(FieldDescriptor const* descriptor);
void ProcessRequiredMessageField(FieldDescriptor const* descriptor);
void ProcessRequiredBoolField(FieldDescriptor const* descriptor);