From 1660c5631e798883139996ea10cba5e602779578 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Tue, 14 Jul 2015 11:38:06 +0100 Subject: [PATCH] Changing reflection namespace (part 4) Update code already within Google.Protobuf.Reflection which was importing Google.Protobuf.DescriptorProtos --- csharp/src/ProtocolBuffers/Reflection/EnumDescriptor.cs | 1 - csharp/src/ProtocolBuffers/Reflection/EnumValueDescriptor.cs | 2 -- csharp/src/ProtocolBuffers/Reflection/FieldDescriptor.cs | 1 - csharp/src/ProtocolBuffers/Reflection/FileDescriptor.cs | 2 -- csharp/src/ProtocolBuffers/Reflection/MessageDescriptor.cs | 1 - csharp/src/ProtocolBuffers/Reflection/MethodDescriptor.cs | 2 -- csharp/src/ProtocolBuffers/Reflection/OneofDescriptor.cs | 1 - csharp/src/ProtocolBuffers/Reflection/ServiceDescriptor.cs | 1 - 8 files changed, 11 deletions(-) diff --git a/csharp/src/ProtocolBuffers/Reflection/EnumDescriptor.cs b/csharp/src/ProtocolBuffers/Reflection/EnumDescriptor.cs index eca85a061d..bf8f8c8356 100644 --- a/csharp/src/ProtocolBuffers/Reflection/EnumDescriptor.cs +++ b/csharp/src/ProtocolBuffers/Reflection/EnumDescriptor.cs @@ -31,7 +31,6 @@ #endregion using System.Collections.Generic; -using Google.Protobuf.DescriptorProtos; namespace Google.Protobuf.Reflection { diff --git a/csharp/src/ProtocolBuffers/Reflection/EnumValueDescriptor.cs b/csharp/src/ProtocolBuffers/Reflection/EnumValueDescriptor.cs index 9c225676b1..29833c4a85 100644 --- a/csharp/src/ProtocolBuffers/Reflection/EnumValueDescriptor.cs +++ b/csharp/src/ProtocolBuffers/Reflection/EnumValueDescriptor.cs @@ -30,8 +30,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endregion -using Google.Protobuf.DescriptorProtos; - namespace Google.Protobuf.Reflection { /// diff --git a/csharp/src/ProtocolBuffers/Reflection/FieldDescriptor.cs b/csharp/src/ProtocolBuffers/Reflection/FieldDescriptor.cs index 99f8551717..3d9d0d75ad 100644 --- a/csharp/src/ProtocolBuffers/Reflection/FieldDescriptor.cs +++ b/csharp/src/ProtocolBuffers/Reflection/FieldDescriptor.cs @@ -31,7 +31,6 @@ #endregion using System; -using Google.Protobuf.DescriptorProtos; namespace Google.Protobuf.Reflection { diff --git a/csharp/src/ProtocolBuffers/Reflection/FileDescriptor.cs b/csharp/src/ProtocolBuffers/Reflection/FileDescriptor.cs index 7738e3b9e9..db39348019 100644 --- a/csharp/src/ProtocolBuffers/Reflection/FileDescriptor.cs +++ b/csharp/src/ProtocolBuffers/Reflection/FileDescriptor.cs @@ -33,8 +33,6 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using Google.Protobuf.DescriptorProtos; -using FileOptions = Google.Protobuf.DescriptorProtos.FileOptions; namespace Google.Protobuf.Reflection { diff --git a/csharp/src/ProtocolBuffers/Reflection/MessageDescriptor.cs b/csharp/src/ProtocolBuffers/Reflection/MessageDescriptor.cs index 2bb4fbedc9..b6351d36d3 100644 --- a/csharp/src/ProtocolBuffers/Reflection/MessageDescriptor.cs +++ b/csharp/src/ProtocolBuffers/Reflection/MessageDescriptor.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; -using Google.Protobuf.DescriptorProtos; namespace Google.Protobuf.Reflection { diff --git a/csharp/src/ProtocolBuffers/Reflection/MethodDescriptor.cs b/csharp/src/ProtocolBuffers/Reflection/MethodDescriptor.cs index 03aba5a1ec..0c9c694937 100644 --- a/csharp/src/ProtocolBuffers/Reflection/MethodDescriptor.cs +++ b/csharp/src/ProtocolBuffers/Reflection/MethodDescriptor.cs @@ -30,8 +30,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endregion -using Google.Protobuf.DescriptorProtos; - namespace Google.Protobuf.Reflection { /// diff --git a/csharp/src/ProtocolBuffers/Reflection/OneofDescriptor.cs b/csharp/src/ProtocolBuffers/Reflection/OneofDescriptor.cs index 94033c7e77..e92dc8bb67 100644 --- a/csharp/src/ProtocolBuffers/Reflection/OneofDescriptor.cs +++ b/csharp/src/ProtocolBuffers/Reflection/OneofDescriptor.cs @@ -32,7 +32,6 @@ using System.Collections.Generic; using System.Collections.ObjectModel; -using Google.Protobuf.DescriptorProtos; namespace Google.Protobuf.Reflection { diff --git a/csharp/src/ProtocolBuffers/Reflection/ServiceDescriptor.cs b/csharp/src/ProtocolBuffers/Reflection/ServiceDescriptor.cs index 75925eb391..cc0a501042 100644 --- a/csharp/src/ProtocolBuffers/Reflection/ServiceDescriptor.cs +++ b/csharp/src/ProtocolBuffers/Reflection/ServiceDescriptor.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; -using Google.Protobuf.DescriptorProtos; namespace Google.Protobuf.Reflection {