← Back to branch summary

~verterok/ubuntu/lucid/protobuf/2.4.0a-backport

« back to all changes in this revision

Viewing changes to src/google/protobuf/generated_message_reflection.cc

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2011-05-31 14:41:47 UTC
  • mfrom: (2.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20110531144147-s41g5fozgvyo462l
Tags: 2.4.0a-2ubuntu1
* Merge with Debian; remaining changes:
  - Fix linking with -lpthread.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/google/protobuf/generated_message_reflection.cc
45
45
namespace protobuf {
46
46
namespace internal {
47
47
 
48
 
namespace { const string kEmptyString; }
49
 
 
50
48
int StringSpaceUsedExcludingSelf(const string& str) {
51
49
  const void* start = &str;
52
50
  const void* end = &str + 1;
69
67
}
70
68
 
71
69
const string& NameOfEnum(const EnumDescriptor* descriptor, int value) {
72
 
  static string kEmptyString;
73
70
  const EnumValueDescriptor* d = descriptor->FindValueByNumber(value);
74
71
  return (d == NULL ? kEmptyString : d->name());
75
72
}