aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/ProtocolBuffers/TextFormat.cs
diff options
context:
space:
mode:
authorJie Luo <jieluo@google.com>2015-04-29 15:55:11 -0700
committerJie Luo <jieluo@google.com>2015-04-29 15:55:11 -0700
commit954bc834133289cd7c844ab4195f574223a0e593 (patch)
tree70453d4abe66ab04aab861d40a95fe4dd1d5e24c /csharp/src/ProtocolBuffers/TextFormat.cs
parent4af18b87117ab463042f90e9d3c00c1bb776bcf7 (diff)
parenta449f66bdb50f3e898889705945fb1ac6b105469 (diff)
downloadprotobuf-954bc834133289cd7c844ab4195f574223a0e593.tar.gz
protobuf-954bc834133289cd7c844ab4195f574223a0e593.tar.bz2
protobuf-954bc834133289cd7c844ab4195f574223a0e593.zip
Merge branch 'csharp' of git://github.com/google/protobuf into google-csharp
Diffstat (limited to 'csharp/src/ProtocolBuffers/TextFormat.cs')
-rw-r--r--csharp/src/ProtocolBuffers/TextFormat.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/csharp/src/ProtocolBuffers/TextFormat.cs b/csharp/src/ProtocolBuffers/TextFormat.cs
index 747dce4e..951cdc0e 100644
--- a/csharp/src/ProtocolBuffers/TextFormat.cs
+++ b/csharp/src/ProtocolBuffers/TextFormat.cs
@@ -300,7 +300,6 @@ namespace Google.ProtocolBuffers
}
}
- [CLSCompliant(false)]
public static ulong ParseUInt64(string text)
{
return (ulong) ParseInteger(text, false, true);
@@ -311,7 +310,6 @@ namespace Google.ProtocolBuffers
return ParseInteger(text, true, true);
}
- [CLSCompliant(false)]
public static uint ParseUInt32(string text)
{
return (uint) ParseInteger(text, false, false);