diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 16:26:16 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 16:26:16 -0700 |
| commit | 3af881c7e2db0553207876acbdb91c6e77974e44 (patch) | |
| tree | 35e2a96cce802d4235bd29afa396e28ead892fa2 /src/google/protobuf/stubs/common.h | |
| parent | 86975301f1876ce1934612777b8ca6c76520f5cc (diff) | |
| parent | 942a29cecd36f2a4b22fdd2179635cd548e6bd27 (diff) | |
Merge master into 3.4.x
Diffstat (limited to 'src/google/protobuf/stubs/common.h')
| -rw-r--r-- | src/google/protobuf/stubs/common.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 79d615df..f32fd228 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -228,10 +228,8 @@ class FatalException : public std::exception { // in some versions of MSVC. // TODO(acozzette): remove these using statements using std::istream; -using std::map; using std::ostream; using std::pair; -using std::set; using std::string; using std::vector; |