aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/compiler/objectivec/objectivec_enum.h
diff options
context:
space:
mode:
authorGravatar Adam Cozzette <acozzette@google.com>2018-01-19 16:46:57 -0800
committerGravatar Adam Cozzette <acozzette@acozzette0.svl.corp.google.com>2018-01-26 16:17:14 -0800
commit39a789e657a52e835c281233b63cc2a6bb387fd4 (patch)
tree18954017db14eb09c290ddbe0425a212b14d2b28 /src/google/protobuf/compiler/objectivec/objectivec_enum.h
parentc236896ec5a7f9c0b021f14be61ee2e0a2c7a91b (diff)
Removed using statements from common.h
These statements pulled a bunch of symbols from the std namespace into the global namespace. This commit removes all of them except for std::string, which is a bit trickier to remove.
Diffstat (limited to 'src/google/protobuf/compiler/objectivec/objectivec_enum.h')
-rw-r--r--src/google/protobuf/compiler/objectivec/objectivec_enum.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_enum.h b/src/google/protobuf/compiler/objectivec/objectivec_enum.h
index 0b41cf73..f52e9e68 100644
--- a/src/google/protobuf/compiler/objectivec/objectivec_enum.h
+++ b/src/google/protobuf/compiler/objectivec/objectivec_enum.h
@@ -59,8 +59,8 @@ class EnumGenerator {
private:
const EnumDescriptor* descriptor_;
- vector<const EnumValueDescriptor*> base_values_;
- vector<const EnumValueDescriptor*> all_values_;
+ std::vector<const EnumValueDescriptor*> base_values_;
+ std::vector<const EnumValueDescriptor*> all_values_;
const string name_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator);