Duplicate declaration of method 'mergeFrom:' #60

alexeyxo · Oct 20, 2015 · d72a612 · d72a612
1 parent 6c77bb2
commit d72a612
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ProtocolBuffers.podspec b/ProtocolBuffers.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ProtocolBuffers"
-  s.version      = "1.9.9"
+  s.version      = "1.9.9.1"
   s.summary      = "Protocol Buffers for Objective-C"
   s.description  = <<-DESC
                       An implementation of Protocol Buffers 2.6 in Objective C.
@@ -52,6 +52,7 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = '6.0'
   s.osx.deployment_target = '10.8'
+  s.watchos.deployment_target = '2.0'
   s.requires_arc = true
 
 end
diff --git a/src/compiler/objc_helpers.cc b/src/compiler/objc_helpers.cc
@@ -522,6 +522,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
             ("superclass",          "pb_superclass")
             ("class",               "pb_class")
             ("description",         "pb_description")
+            ("from",                "pb_from")
             ("debugDescription",    "pb_debugDescription");
 
         NSObjectMap::const_iterator it = keywords.find(name);