From b73bd168d4c816da81628df35b53685d2cf0ef8c Mon Sep 17 00:00:00 2001 From: csharptest Date: Thu, 14 Jul 2011 13:12:04 -0500 Subject: Fix for unqualified ByteString references in LITE generation --- src/ProtoGen/FieldGeneratorBase.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/ProtoGen/FieldGeneratorBase.cs b/src/ProtoGen/FieldGeneratorBase.cs index bd1bb08f..c64608d7 100644 --- a/src/ProtoGen/FieldGeneratorBase.cs +++ b/src/ProtoGen/FieldGeneratorBase.cs @@ -185,7 +185,7 @@ namespace Google.ProtocolBuffers.ProtoGen if (UseLiteRuntime && Descriptor.DefaultValue is ByteString) { string temp = (((ByteString) Descriptor.DefaultValue).ToBase64()); - return String.Format("ByteString.FromBase64(\"{0}\")", temp); + return String.Format("pb::ByteString.FromBase64(\"{0}\")", temp); } return string.Format("(pb::ByteString) {0}.Descriptor.Fields[{1}].DefaultValue", GetClassName(Descriptor.ContainingType), Descriptor.Index); @@ -202,10 +202,9 @@ namespace Google.ProtocolBuffers.ProtoGen } if (UseLiteRuntime && Descriptor.DefaultValue is String) { - string temp = - Convert.ToBase64String( + string temp = Convert.ToBase64String( Encoding.UTF8.GetBytes((String) Descriptor.DefaultValue)); - return String.Format("ByteString.FromBase64(\"{0}\").ToStringUtf8()", temp); + return String.Format("pb::ByteString.FromBase64(\"{0}\").ToStringUtf8()", temp); } return string.Format("(string) {0}.Descriptor.Fields[{1}].DefaultValue", GetClassName(Descriptor.ContainingType), Descriptor.Index); -- cgit v1.2.3