Merge pull request #5297 from brian-peloton/master

Remove unused types
6 years ago · 96f7c5383f
parent 63d2f3bc80 7834dbf820
commit 96f7c5383f
2 changed files with 1 additions and 2 deletions
--- a/src/google/protobuf/extension_set.cc
+++ b/src/google/protobuf/extension_set.cc
@ -280,7 +280,7 @@ void ExtensionSet::ClearExtension(int number) {

 namespace {

-enum Cardinality {
+enum {
  REPEATED,
  OPTIONAL
 };
--- a/src/google/protobuf/stubs/common.cc
+++ b/src/google/protobuf/stubs/common.cc
@ -342,7 +342,6 @@ uint32 ghtonl(uint32 x) {

 namespace internal {

-typedef void OnShutdownFunc();
 struct ShutdownData {
  ~ShutdownData() {
    std::reverse(functions.begin(), functions.end());