aboutsummaryrefslogtreecommitdiff
path: root/objectivec/google/protobuf/Any.pbobjc.h
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2016-07-01 11:02:04 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2016-07-01 11:02:04 -0700
commite102db1f050fbf4d1adfa4cf0eeea69ac223af63 (patch)
treeeb67e17c604af30ef258f656a92bc9ee3e23eeb6 /objectivec/google/protobuf/Any.pbobjc.h
parentaeff638a4cbc2da0b19b61a1cebd40145f892b2d (diff)
downloadprotobuf-e102db1f050fbf4d1adfa4cf0eeea69ac223af63.tar.gz
protobuf-e102db1f050fbf4d1adfa4cf0eeea69ac223af63.tar.bz2
protobuf-e102db1f050fbf4d1adfa4cf0eeea69ac223af63.zip
Fix some failing travis tests.
1. Add missing header file to Makefile.am. 2. Re-generate objectivec generated code for well-known types. Change-Id: If28217c701cf8bd739ea0db240e9eee600f23ee7
Diffstat (limited to 'objectivec/google/protobuf/Any.pbobjc.h')
-rw-r--r--objectivec/google/protobuf/Any.pbobjc.h16
1 files changed, 13 insertions, 3 deletions
diff --git a/objectivec/google/protobuf/Any.pbobjc.h b/objectivec/google/protobuf/Any.pbobjc.h
index e9a8533a..4253b604 100644
--- a/objectivec/google/protobuf/Any.pbobjc.h
+++ b/objectivec/google/protobuf/Any.pbobjc.h
@@ -71,6 +71,16 @@ typedef GPB_ENUM(GPBAny_FieldNumber) {
/// foo = any.unpack(Foo.class);
/// }
///
+/// Example 3: Pack and unpack a message in Python.
+///
+/// foo = Foo(...)
+/// any = Any()
+/// any.Pack(foo)
+/// ...
+/// if any.Is(Foo.DESCRIPTOR):
+/// any.Unpack(foo)
+/// ...
+///
/// The pack methods provided by protobuf library will by default use
/// 'type.googleapis.com/full.type.name' as the type URL and the unpack
/// methods only use the fully qualified type name after the last '/'
@@ -110,10 +120,10 @@ typedef GPB_ENUM(GPBAny_FieldNumber) {
/// A URL/resource name whose content describes the type of the
/// serialized protocol buffer message.
///
-/// For URLs which use the schema `http`, `https`, or no schema, the
+/// For URLs which use the scheme `http`, `https`, or no scheme, the
/// following restrictions and interpretations apply:
///
-/// * If no schema is provided, `https` is assumed.
+/// * If no scheme is provided, `https` is assumed.
/// * The last segment of the URL's path must represent the fully
/// qualified name of the type (as in `path/google.protobuf.Duration`).
/// The name should be in a canonical form (e.g., leading "." is
@@ -126,7 +136,7 @@ typedef GPB_ENUM(GPBAny_FieldNumber) {
/// on changes to types. (Use versioned type names to manage
/// breaking changes.)
///
-/// Schemas other than `http`, `https` (or the empty schema) might be
+/// Schemes other than `http`, `https` (or the empty scheme) might be
/// used with implementation specific semantics.
@property(nonatomic, readwrite, copy, null_resettable) NSString *typeURL;