Merge pull request #5297 from brian-peloton/master

Remove unused types

Merge pull request #5297 from brian-peloton/master
Remove unused types
96f7c538 · Adam Cozzette · GitHub · 63d2f3bc · 7834dbf8 · 96f7c538
Unverified Commit 96f7c538 authored Oct 31, 2018 by Adam Cozzette Committed by GitHub Oct 31, 2018
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

extension_set.cc src/google/protobuf/extension_set.cc +1 -1

common.cc src/google/protobuf/stubs/common.cc +0 -1

No files found.
--- 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());