Upgrade linux protobuf
This commit is contained in:
1 parent
79f2f356d5
commit
0f3130fb47
689 files changed
+141922
-132057
No files matched your search
@@ -41,17 +41,19 @@
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
namespace compiler {
|
||||
namespace java {
|
||||
class Context; // context.h
|
||||
class ClassNameResolver; // name_resolver.h
|
||||
}
|
||||
}
|
||||
namespace io {
|
||||
class Printer; // printer.h
|
||||
}
|
||||
namespace compiler {
|
||||
namespace java {
|
||||
class Context; // context.h
|
||||
class ClassNameResolver; // name_resolver.h
|
||||
} // namespace java
|
||||
} // namespace compiler
|
||||
namespace io {
|
||||
class Printer; // printer.h
|
||||
}
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
namespace compiler {
|
||||
namespace java {
|
||||
@@ -67,9 +69,9 @@ class EnumLiteGenerator {
|
||||
private:
|
||||
const EnumDescriptor* descriptor_;
|
||||
|
||||
// The proto language allows multiple enum constants to have the same numeric
|
||||
// value. Java, however, does not allow multiple enum constants to be
|
||||
// considered equivalent. We treat the first defined constant for any
|
||||
// The proto language allows multiple enum constants to have the same
|
||||
// numeric value. Java, however, does not allow multiple enum constants to
|
||||
// be considered equivalent. We treat the first defined constant for any
|
||||
// given numeric value as "canonical" and the rest as aliases of that
|
||||
// canonical value.
|
||||
std::vector<const EnumValueDescriptor*> canonical_values_;
|
||||
@@ -85,14 +87,12 @@ class EnumLiteGenerator {
|
||||
Context* context_;
|
||||
ClassNameResolver* name_resolver_;
|
||||
|
||||
bool CanUseEnumValues();
|
||||
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumLiteGenerator);
|
||||
};
|
||||
|
||||
} // namespace java
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
|
||||
} // namespace google
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_LITE_H__
|
||||
Reference in new issue
Block a user