aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcsharptest <roger@csharptest.net>2011-07-14 13:12:04 -0500
committerrogerk <devnull@localhost>2011-07-14 13:12:04 -0500
commitb73bd168d4c816da81628df35b53685d2cf0ef8c (patch)
tree5eb75f5f5bd68b097ece3d63583942eab7efb1e0 /src
parent8dc7b830a3b2e11348e8e498bce02b97095833e6 (diff)
downloadprotobuf-b73bd168d4c816da81628df35b53685d2cf0ef8c.tar.gz
protobuf-b73bd168d4c816da81628df35b53685d2cf0ef8c.tar.bz2
protobuf-b73bd168d4c816da81628df35b53685d2cf0ef8c.zip
Fix for unqualified ByteString references in LITE generation
Diffstat (limited to 'src')
-rw-r--r--src/ProtoGen/FieldGeneratorBase.cs7
1 files changed, 3 insertions, 4 deletions
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);