Refactoring compatibility code to use FrameworkPortability class

5 files changed, 11 insertions, 17 deletions

diff --git a/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs b/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs
index 2da0080e..4f4e13d8 100644
--- a/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs
+++ b/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs
@@ -575,7 +575,7 @@ namespace Google.ProtocolBuffers
                 case FieldType.Enum:

                     if (value is Enum)

                     {

-                        return ComputeEnumSize(fieldNumber, ((IConvertible) value).ToInt32(CultureInfo.InvariantCulture));

+                        return ComputeEnumSize(fieldNumber, ((IConvertible)value).ToInt32(FrameworkPortability.InvariantCulture));

                     }

                     else

                     {

@@ -631,7 +631,7 @@ namespace Google.ProtocolBuffers
                 case FieldType.Enum:

                     if (value is Enum)

                     {

-                        return ComputeEnumSizeNoTag(((IConvertible) value).ToInt32(CultureInfo.InvariantCulture));

+                        return ComputeEnumSizeNoTag(((IConvertible)value).ToInt32(FrameworkPortability.InvariantCulture));

                     }

                     else

                     {

diff --git a/src/ProtocolBuffers/Delegates.cs b/src/ProtocolBuffers/Delegates.cs
index 0a7dec07..3b62bc0c 100644
--- a/src/ProtocolBuffers/Delegates.cs
+++ b/src/ProtocolBuffers/Delegates.cs
@@ -50,11 +50,5 @@ namespace Google.ProtocolBuffers
 

     internal delegate TResult Func<T1, T2, TResult>(T1 arg1, T2 arg2);

 

-    internal delegate TResult Func<T1, T2, T3, TResult>(T1 arg1, T2 arg2, T3 arg3);

-

-    internal delegate TResult Func<T1, T2, T3, T4, TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4);

-

-    internal delegate void Action();

-

     internal delegate void Action<T1, T2>(T1 arg1, T2 arg2);

 }
\ No newline at end of file
diff --git a/src/ProtocolBuffers/GeneratedMessageLite.cs b/src/ProtocolBuffers/GeneratedMessageLite.cs
index aecba7d6..0dfc976b 100644
--- a/src/ProtocolBuffers/GeneratedMessageLite.cs
+++ b/src/ProtocolBuffers/GeneratedMessageLite.cs
@@ -111,7 +111,7 @@ namespace Google.ProtocolBuffers
             }

             else

             {

-                writer.WriteLine("{0}: {1}", name, ((IConvertible) value).ToString(CultureInfo.InvariantCulture));

+                writer.WriteLine("{0}: {1}", name, ((IConvertible)value).ToString(FrameworkPortability.InvariantCulture));

             }

         }

 

diff --git a/src/ProtocolBuffers/TextFormat.cs b/src/ProtocolBuffers/TextFormat.cs
index bbc76186..c0f4a5f6 100644
--- a/src/ProtocolBuffers/TextFormat.cs
+++ b/src/ProtocolBuffers/TextFormat.cs
@@ -170,10 +170,10 @@ namespace Google.ProtocolBuffers
                     // the double to/from string will trim the precision to 6 places.  As with other numeric formats

                     // below, always use the invariant culture so it's predictable.

                 case FieldType.Float:

-                    generator.Print(((float) value).ToString("r", CultureInfo.InvariantCulture));

+                    generator.Print(((float)value).ToString("r", FrameworkPortability.InvariantCulture));

                     break;

                 case FieldType.Double:

-                    generator.Print(((double) value).ToString("r", CultureInfo.InvariantCulture));

+                    generator.Print(((double)value).ToString("r", FrameworkPortability.InvariantCulture));

                     break;

 

                 case FieldType.Int32:

@@ -188,7 +188,7 @@ namespace Google.ProtocolBuffers
                 case FieldType.Fixed64:

                     // The simple Object.ToString converts using the current culture.

                     // We want to always use the invariant culture so it's predictable.

-                    generator.Print(((IConvertible) value).ToString(CultureInfo.InvariantCulture));

+                    generator.Print(((IConvertible)value).ToString(FrameworkPortability.InvariantCulture));

                     break;

                 case FieldType.Bool:

                     // Explicitly use the Java true/false

@@ -314,7 +314,7 @@ namespace Google.ProtocolBuffers
                 case "nanf":

                     return float.NaN;

                 default:

-                    return float.Parse(text, CultureInfo.InvariantCulture);

+                    return float.Parse(text, FrameworkPortability.InvariantCulture);

             }

         }

 

@@ -331,7 +331,7 @@ namespace Google.ProtocolBuffers
                 case "nan":

                     return double.NaN;

                 default:

-                    return double.Parse(text, CultureInfo.InvariantCulture);

+                    return double.Parse(text, FrameworkPortability.InvariantCulture);

             }

         }

 

@@ -708,7 +708,7 @@ namespace Google.ProtocolBuffers
                 {

                     // Explicitly specify the invariant culture so that this code does not break when

                     // executing in Turkey.

-                    String lowerName = name.ToLower(CultureInfo.InvariantCulture);

+                    String lowerName = name.ToLower(FrameworkPortability.InvariantCulture);

                     field = type.FindDescriptor<FieldDescriptor>(lowerName);

                     // If the case-insensitive match worked but the field is NOT a group,

                     // TODO(jonskeet): What? Java comment ends here!

diff --git a/src/ProtocolBuffers/TextTokenizer.cs b/src/ProtocolBuffers/TextTokenizer.cs
index 7fdbd1d6..90774bc2 100644
--- a/src/ProtocolBuffers/TextTokenizer.cs
+++ b/src/ProtocolBuffers/TextTokenizer.cs
@@ -346,7 +346,7 @@ namespace Google.ProtocolBuffers
 

             try

             {

-                double result = double.Parse(currentToken, CultureInfo.InvariantCulture);

+                double result = double.Parse(currentToken, FrameworkPortability.InvariantCulture);

                 NextToken();

                 return result;

             }

@@ -387,7 +387,7 @@ namespace Google.ProtocolBuffers
 

             try

             {

-                float result = float.Parse(currentToken, CultureInfo.InvariantCulture);

+                float result = float.Parse(currentToken, FrameworkPortability.InvariantCulture);

                 NextToken();

                 return result;

             }