Lite feature complete.
diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
index 2f1a183..d64101b 100644
--- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
+++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
@@ -73,7 +73,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ReflectionTester.cs" />
<Compile Include="ServiceTest.cs" />
- <Compile Include="TestProtos\FIXUP.cs" />
<Compile Include="TestProtos\UnitTestCSharpOptionsProtoFile.cs" />
<Compile Include="TestProtos\UnitTestCustomOptionsProtoFile.cs" />
<Compile Include="TestProtos\UnitTestEmbedOptimizeForProtoFile.cs" />
diff --git a/src/ProtocolBuffers.Test/ReflectionTester.cs b/src/ProtocolBuffers.Test/ReflectionTester.cs
index 32b6446..3e7ed39 100644
--- a/src/ProtocolBuffers.Test/ReflectionTester.cs
+++ b/src/ProtocolBuffers.Test/ReflectionTester.cs
@@ -213,7 +213,7 @@
ExtensionInfo extension = extensionRegistry[field.ContainingType, field.FieldNumber];
Assert.IsNotNull(extension);
Assert.IsNotNull(extension.DefaultInstance);
- return extension.DefaultInstance.WeakCreateBuilderForType();
+ return (IBuilder)extension.DefaultInstance.WeakCreateBuilderForType();
}
}
diff --git a/src/ProtocolBuffers.Test/TestProtos/FIXUP.cs b/src/ProtocolBuffers.Test/TestProtos/FIXUP.cs
deleted file mode 100644
index 39560fb..0000000
--- a/src/ProtocolBuffers.Test/TestProtos/FIXUP.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Google.ProtocolBuffers.TestProtos {
- public sealed partial class TestExtremeDefaultValues {
-
-#warning ToDo - These values are not currently handled by the generator...
- const double InfinityD = double.PositiveInfinity;
- const double NaND = double.NaN;
- const float InfinityF = float.PositiveInfinity;
- const float NaNF = float.NaN;
- }
-}
diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
index 6e6d7c4..5acb333 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
@@ -12852,7 +12852,7 @@
public const int InfDoubleFieldNumber = 14;
private bool hasInfDouble;
- private double infDouble_ = InfinityD;
+ private double infDouble_ = double.PositiveInfinity;
public bool HasInfDouble {
get { return hasInfDouble; }
}
@@ -12862,7 +12862,7 @@
public const int NegInfDoubleFieldNumber = 15;
private bool hasNegInfDouble;
- private double negInfDouble_ = -InfinityD;
+ private double negInfDouble_ = double.NegativeInfinity;
public bool HasNegInfDouble {
get { return hasNegInfDouble; }
}
@@ -12872,7 +12872,7 @@
public const int NanDoubleFieldNumber = 16;
private bool hasNanDouble;
- private double nanDouble_ = NaND;
+ private double nanDouble_ = double.NaN;
public bool HasNanDouble {
get { return hasNanDouble; }
}
@@ -12882,7 +12882,7 @@
public const int InfFloatFieldNumber = 17;
private bool hasInfFloat;
- private float infFloat_ = InfinityF;
+ private float infFloat_ = float.PositiveInfinity;
public bool HasInfFloat {
get { return hasInfFloat; }
}
@@ -12892,7 +12892,7 @@
public const int NegInfFloatFieldNumber = 18;
private bool hasNegInfFloat;
- private float negInfFloat_ = -InfinityF;
+ private float negInfFloat_ = float.NegativeInfinity;
public bool HasNegInfFloat {
get { return hasNegInfFloat; }
}
@@ -12902,7 +12902,7 @@
public const int NanFloatFieldNumber = 19;
private bool hasNanFloat;
- private float nanFloat_ = NaNF;
+ private float nanFloat_ = float.NaN;
public bool HasNanFloat {
get { return hasNanFloat; }
}
@@ -13558,7 +13558,7 @@
}
public Builder ClearInfDouble() {
result.hasInfDouble = false;
- result.infDouble_ = InfinityD;
+ result.infDouble_ = double.PositiveInfinity;
return this;
}
@@ -13576,7 +13576,7 @@
}
public Builder ClearNegInfDouble() {
result.hasNegInfDouble = false;
- result.negInfDouble_ = -InfinityD;
+ result.negInfDouble_ = double.NegativeInfinity;
return this;
}
@@ -13594,7 +13594,7 @@
}
public Builder ClearNanDouble() {
result.hasNanDouble = false;
- result.nanDouble_ = NaND;
+ result.nanDouble_ = double.NaN;
return this;
}
@@ -13612,7 +13612,7 @@
}
public Builder ClearInfFloat() {
result.hasInfFloat = false;
- result.infFloat_ = InfinityF;
+ result.infFloat_ = float.PositiveInfinity;
return this;
}
@@ -13630,7 +13630,7 @@
}
public Builder ClearNegInfFloat() {
result.hasNegInfFloat = false;
- result.negInfFloat_ = -InfinityF;
+ result.negInfFloat_ = float.NegativeInfinity;
return this;
}
@@ -13648,7 +13648,7 @@
}
public Builder ClearNanFloat() {
result.hasNanFloat = false;
- result.nanFloat_ = NaNF;
+ result.nanFloat_ = float.NaN;
return this;
}
}