From a41a9dd532c2723c5d7c379a299a7cd403ac8775 Mon Sep 17 00:00:00 2001 From: "kenton@google.com" Date: Fri, 3 Oct 2008 17:27:48 +0000 Subject: * Fixed template specialization syntax that MSVC 2005 didn't like. Not sure if it was valid or not. * Moved UTF-8 coding directive to the right place in reflection_test.py. --- src/google/protobuf/descriptor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/google/protobuf/descriptor.cc') diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc index 3b018517..0f243ce5 100644 --- a/src/google/protobuf/descriptor.cc +++ b/src/google/protobuf/descriptor.cc @@ -2208,7 +2208,7 @@ template void DescriptorBuilder::AllocateOptions( } // We specialize for FileDescriptor. -template<> void DescriptorBuilder::AllocateOptions( +template<> void DescriptorBuilder::AllocateOptions( const FileDescriptor::OptionsType& orig_options, FileDescriptor* descriptor) { // We add the dummy token so that LookupSymbol does the right thing. -- cgit v1.2.3