aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
diff options
context:
space:
mode:
authorJon Skeet <skeet@pobox.com>2015-11-19 12:36:51 +0000
committerJon Skeet <skeet@pobox.com>2015-11-19 12:36:51 +0000
commitff37edcd8a533b5440dfae541ea85f8b41d94e55 (patch)
tree0ab0f79a8121e4c8a5d49afc6caae561963f7ed4 /csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
parentc581acb562fad93c4eb7b125cc31b64fa6f51868 (diff)
parent360feda5f76e62a3a8e5b086bdb3b851f7730f2e (diff)
downloadprotobuf-ff37edcd8a533b5440dfae541ea85f8b41d94e55.tar.gz
protobuf-ff37edcd8a533b5440dfae541ea85f8b41d94e55.tar.bz2
protobuf-ff37edcd8a533b5440dfae541ea85f8b41d94e55.zip
Merge pull request #974 from jskeet/parser
Parser property in MessageDescriptor
Diffstat (limited to 'csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs')
-rw-r--r--csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
index 121e3c47..a26b2bf8 100644
--- a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
+++ b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
@@ -31,7 +31,7 @@ namespace Google.Protobuf.WellKnownTypes {
descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
new pbr::FileDescriptor[] { },
new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] {
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Timestamp), new[]{ "Seconds", "Nanos" }, null, null, null)
+ new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Timestamp), global::Google.Protobuf.WellKnownTypes.Timestamp.Parser, new[]{ "Seconds", "Nanos" }, null, null, null)
}));
}
#endregion