← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/protobuf/oneiric

« back to all changes in this revision

Viewing changes to src/google/protobuf/compiler/java/java_helpers.h

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2009-11-16 10:41:33 UTC
  • mfrom: (2.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20091116104133-ykhy3deg5l4975tw
Tags: 2.1.0-1ubuntu1
* Merge from Debian testing.
* Remaining Ubuntu changes:
  - Disable the death tests on IA64, now as a quilt patch.
  - Don't use python2.4, also as a quilt patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/google/protobuf/compiler/java/java_helpers.h
88
88
}
89
89
string ClassName(const FileDescriptor* descriptor);
90
90
 
 
91
// Get the unqualified name that should be used for a field's field
 
92
// number constant.
 
93
string FieldConstantName(const FieldDescriptor *field);
 
94
 
91
95
enum JavaType {
92
96
  JAVATYPE_INT,
93
97
  JAVATYPE_LONG,