diff options
| author |  kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-10-03 17:27:48 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-10-03 17:27:48 +0000 |
| commit | a41a9dd532c2723c5d7c379a299a7cd403ac8775 (patch) | |
| tree | 63aba5e7f3cf5188d1909948fec45faec3c33963 | |
| parent | c76caaccb8385a4474e674a2aed9be4c3e1be785 (diff) | |
* 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.
| -rwxr-xr-x | python/google/protobuf/internal/reflection_test.py | 6 | ||||
| -rw-r--r-- | src/google/protobuf/descriptor.cc | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/python/google/protobuf/internal/reflection_test.py b/python/google/protobuf/internal/reflection_test.py index b569b61f..c8e60005 100755 --- a/python/google/protobuf/internal/reflection_test.py +++ b/python/google/protobuf/internal/reflection_test.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + # Protocol Buffers - Google's data interchange format # Copyright 2008 Google Inc. All rights reserved. # http://code.google.com/p/protobuf/ @@ -28,10 +30,6 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -*- coding: utf-8 -*- -# -# Copyright 2007 Google Inc. All Rights Reserved. - """Unittest for reflection.py, which also indirectly tests the output of the pure-Python protocol compiler. """ 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<class DescriptorT> void DescriptorBuilder::AllocateOptions( } // We specialize for FileDescriptor. -template<> void DescriptorBuilder::AllocateOptions( +template<> void DescriptorBuilder::AllocateOptions<FileDescriptor>( const FileDescriptor::OptionsType& orig_options, FileDescriptor* descriptor) { // We add the dummy token so that LookupSymbol does the right thing. |