aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/compiler/main.cc
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2015-11-30 14:38:04 -0500
committerThomas Van Lenten <thomasvl@google.com>2016-02-18 13:55:59 -0500
commit2480acb6d974a2cfc1da5b1ea8cc14f2415e6dfe (patch)
tree3e95be3eae1e7d0ff8dce89951b167843127fb94 /src/google/protobuf/compiler/main.cc
parent9ab11c6561abd5fe997a999f21799d160b0d14cf (diff)
downloadprotobuf-2480acb6d974a2cfc1da5b1ea8cc14f2415e6dfe.tar.gz
protobuf-2480acb6d974a2cfc1da5b1ea8cc14f2415e6dfe.tar.bz2
protobuf-2480acb6d974a2cfc1da5b1ea8cc14f2415e6dfe.zip
Support ObjC Generic Collections
- Extend GPB*ObjectDictionary to support generic syntax. - Update the generator to output generics so the enclosed type is exposed for compiler checks. - Use generics in a the public interfaces. - Update the generated sources that are checked in.
Diffstat (limited to 'src/google/protobuf/compiler/main.cc')
-rw-r--r--src/google/protobuf/compiler/main.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/main.cc b/src/google/protobuf/compiler/main.cc
index 97df536e..66ad13b7 100644
--- a/src/google/protobuf/compiler/main.cc
+++ b/src/google/protobuf/compiler/main.cc
@@ -78,7 +78,7 @@ int main(int argc, char* argv[]) {
// Objective C
google::protobuf::compiler::objectivec::ObjectiveCGenerator objc_generator;
- cli.RegisterGenerator("--objc_out", &objc_generator,
+ cli.RegisterGenerator("--objc_out", "--objc_opt", &objc_generator,
"Generate Objective C header and source.");
// JavaScript