Skip to content

Commit

Permalink
Generic Response Object Serialization
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeyxo committed Jan 27, 2015
1 parent a1de968 commit ebcd843
Showing 25 changed files with 502 additions and 189 deletions.
4 changes: 2 additions & 2 deletions ProtocolBuffers.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ProtocolBuffers"
s.version = "1.9.6"
s.version = "1.9.7"
s.summary = "Protocol Buffers for Objective-C"
s.description = <<-DESC
An implementation of Protocol Buffers 2.6 in Objective C.
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
DESC
s.homepage = "http://protobuf.io#objc"
s.license = "Apache 2.0"

s.documentation_url = "https://github.com/alexeyxo/protobuf-objc"
s.license = { :type => 'Apache License, Version 2.0', :text =>
<<-LICENSE
Licensed under the Apache License, Version 2.0 (the "License");
4 changes: 2 additions & 2 deletions src/compiler/objc_message.cc
Original file line number Diff line number Diff line change
@@ -254,12 +254,12 @@ namespace google { namespace protobuf { namespace compiler { namespace objective

if (descriptor_->extension_range_count() > 0) {
printer->Print(
"@interface $classname$ : PBExtendableMessage {\n"
"@interface $classname$ : PBExtendableMessage<GeneratedMessageProtocol> {\n"
"@private\n",
"classname", ClassName(descriptor_));
} else {
printer->Print(
"@interface $classname$ : PBGeneratedMessage {\n"
"@interface $classname$ : PBGeneratedMessage<GeneratedMessageProtocol> {\n"
"@private\n",
"classname", ClassName(descriptor_));
}
46 changes: 25 additions & 21 deletions src/runtime/Classes/Descriptor.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

90 changes: 86 additions & 4 deletions src/runtime/Classes/Descriptor.pb.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ebcd843

Please sign in to comment.