← Back to branch summary

~ubuntu-branches/debian/stretch/protobuf/stretch

« back to all changes in this revision

Viewing changes to src/google/protobuf/compiler/command_line_interface.cc

  • Committer: Package Import Robot
  • Author(s): Robert Edmonds
  • Date: 2014-09-22 16:52:50 UTC
  • Revision ID: package-import@ubuntu.com-20140922165250-we74u013n3n11x41
Tags: 2.6.0-4
Merge post-2.6.0 fixes that were merged upstream. In particular,
protoc-generated code should now compile correctly when built with Clang.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/google/protobuf/compiler/command_line_interface.cc
1559
1559
  string output;
1560
1560
  StringAppendF(&output, "%-35s free:", name.c_str());
1561
1561
  int next_free_number = 1;
1562
 
  for (set<FieldRange>::iterator i = ranges.begin();
 
1562
  for (set<FieldRange>::const_iterator i = ranges.begin();
1563
1563
       i != ranges.end(); ++i) {
1564
1564
    // This happens when groups re-use parent field numbers, in which
1565
1565
    // case we skip the FieldRange entirely.