From de754375737bf251e2ddc5bb6904c74da0954a25 Mon Sep 17 00:00:00 2001 From: "kenton@google.com" Date: Thu, 6 Nov 2008 21:36:28 +0000 Subject: Simplify some template usage so that older compilers can handle it. (Users report that MSVC 2003 in particular needs this change.) --- src/google/protobuf/descriptor.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/google/protobuf/descriptor.cc') diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc index 0f243ce5..b843a06b 100644 --- a/src/google/protobuf/descriptor.cc +++ b/src/google/protobuf/descriptor.cc @@ -1693,6 +1693,9 @@ class DescriptorBuilder { template void AllocateOptions( const typename DescriptorT::OptionsType& orig_options, DescriptorT* descriptor); + // Specialization for FileOptions. + void AllocateOptions(const FileOptions& orig_options, + FileDescriptor* descriptor); // Implementation for AllocateOptions(). Don't call this directly. template void AllocateOptionsImpl( @@ -2208,9 +2211,8 @@ template void DescriptorBuilder::AllocateOptions( } // We specialize for FileDescriptor. -template<> void DescriptorBuilder::AllocateOptions( - const FileDescriptor::OptionsType& orig_options, - FileDescriptor* descriptor) { +void DescriptorBuilder::AllocateOptions(const FileOptions& orig_options, + FileDescriptor* descriptor) { // We add the dummy token so that LookupSymbol does the right thing. AllocateOptionsImpl(descriptor->package() + ".dummy", descriptor->name(), orig_options, descriptor); -- cgit v1.2.3