~ubuntu-branches/ubuntu/trusty/protobuf/trusty-proposed

« back to all changes in this revision

Viewing changes to src/google/protobuf/extension_set.h

Committer: Bazaar Package Importer
Author(s): Matthias Klose
Date: 2011-05-31 14:41:47 UTC
mfrom: (2.2.8 sid)
Revision ID: james.westby@ubuntu.com-20110531144147-s41g5fozgvyo462l

Tags: 2.4.0a-2ubuntu1

* Merge with Debian; remaining changes:
- Fix linking with -lpthread.

files added:
.pc/autogen.diff/m4/lt~obsolete.m4

debian/libprotobuf-lite7.install

debian/libprotobuf-lite7.shlibs

debian/libprotobuf7.install

debian/libprotobuf7.shlibs

debian/libprotoc7.install

debian/libprotoc7.shlibs

debian/python-protobuf.README.Debian

java/src/main/java/com/google/protobuf/LazyStringArrayList.java

java/src/main/java/com/google/protobuf/LazyStringList.java

java/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java

java/src/main/java/com/google/protobuf/MessageOrBuilder.java

java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java

java/src/main/java/com/google/protobuf/SingleFieldBuilder.java

java/src/main/java/com/google/protobuf/SmallSortedMap.java

java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java

java/src/test/java/com/google/protobuf/DeprecatedFieldTest.java

java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java

java/src/test/java/com/google/protobuf/LazyStringArrayListTest.java

java/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java

java/src/test/java/com/google/protobuf/NestedBuildersTest.java

java/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java

java/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java

java/src/test/java/com/google/protobuf/SmallSortedMapTest.java

java/src/test/java/com/google/protobuf/TestBadIdentifiers.java

java/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java

java/src/test/java/com/google/protobuf/nested_builders_test.proto

java/src/test/java/com/google/protobuf/nested_extension.proto

java/src/test/java/com/google/protobuf/nested_extension_lite.proto

java/src/test/java/com/google/protobuf/non_nested_extension.proto

java/src/test/java/com/google/protobuf/non_nested_extension_lite.proto

java/src/test/java/com/google/protobuf/test_bad_identifiers.proto

python/google/protobuf/internal/api_implementation.py

python/google/protobuf/internal/cpp_message.py

python/google/protobuf/internal/python_message.py

python/google/protobuf/pyext

python/google/protobuf/pyext/python-proto2.cc

python/google/protobuf/pyext/python_descriptor.cc

python/google/protobuf/pyext/python_descriptor.h

python/google/protobuf/pyext/python_protobuf.cc

python/google/protobuf/pyext/python_protobuf.h

src/google/protobuf/compiler/java/java_string_field.cc

src/google/protobuf/compiler/java/java_string_field.h

files removed:
.pc/autogen.diff/config.h.in

.pc/autogen.diff/depcomp

.pc/autogen.diff/gtest/build-aux/config.h.in

.pc/autogen.diff/gtest/build-aux/depcomp

.pc/autogen.diff/gtest/build-aux/install-sh

.pc/autogen.diff/gtest/build-aux/missing

.pc/autogen.diff/install-sh

.pc/autogen.diff/m4/ltsugar.m4

.pc/autogen.diff/missing

.pc/default_python_version

.pc/default_python_version/python

.pc/default_python_version/python/mox.py

.pc/default_python_version/python/stubout.py

debian/libprotobuf-lite6.install

debian/libprotobuf-lite6.shlibs

debian/libprotobuf6.install

debian/libprotobuf6.shlibs

debian/libprotoc6.install

debian/libprotoc6.shlibs

debian/patches/default_python_version

src/google/protobuf/stubs/hash.cc

files modified:
.pc/applied-patches

.pc/autogen.diff/Makefile.in

.pc/autogen.diff/aclocal.m4

.pc/autogen.diff/config.guess

.pc/autogen.diff/config.sub

.pc/autogen.diff/configure

.pc/autogen.diff/gtest/Makefile.in

.pc/autogen.diff/gtest/aclocal.m4

.pc/autogen.diff/gtest/build-aux/config.guess

.pc/autogen.diff/gtest/build-aux/config.sub

.pc/autogen.diff/gtest/build-aux/ltmain.sh

.pc/autogen.diff/gtest/configure

.pc/autogen.diff/ltmain.sh

.pc/autogen.diff/m4/libtool.m4

.pc/autogen.diff/m4/ltoptions.m4

.pc/autogen.diff/m4/ltversion.m4

.pc/autogen.diff/src/Makefile.in

.pc/disable-setuptools-download.diff/python/ez_setup.py

.pc/link-pthread.diff/m4/acx_pthread.m4

CHANGES.txt

CONTRIBUTORS.txt

Makefile.am

Makefile.in

aclocal.m4

config.guess

config.h.in

config.sub

configure

configure.ac

debian/changelog

debian/control

debian/java-build.xml

debian/libprotobuf-java.links

debian/patches/autogen.diff

debian/patches/series

debian/pkg-test.sh

debian/rules

debian/watch

gtest/Makefile.in

gtest/aclocal.m4

gtest/build-aux/config.guess

gtest/build-aux/config.sub

gtest/build-aux/ltmain.sh

gtest/configure

java/pom.xml

java/src/main/java/com/google/protobuf/AbstractMessage.java

java/src/main/java/com/google/protobuf/AbstractMessageLite.java

java/src/main/java/com/google/protobuf/ByteString.java

java/src/main/java/com/google/protobuf/CodedInputStream.java

java/src/main/java/com/google/protobuf/CodedOutputStream.java

java/src/main/java/com/google/protobuf/Descriptors.java

java/src/main/java/com/google/protobuf/FieldSet.java

java/src/main/java/com/google/protobuf/GeneratedMessage.java

java/src/main/java/com/google/protobuf/GeneratedMessageLite.java

java/src/main/java/com/google/protobuf/Internal.java

java/src/main/java/com/google/protobuf/Message.java

java/src/main/java/com/google/protobuf/MessageLite.java

java/src/main/java/com/google/protobuf/ServiceException.java

java/src/main/java/com/google/protobuf/TextFormat.java

java/src/main/java/com/google/protobuf/WireFormat.java

java/src/test/java/com/google/protobuf/AbstractMessageTest.java

java/src/test/java/com/google/protobuf/CodedInputStreamTest.java

java/src/test/java/com/google/protobuf/CodedOutputStreamTest.java

java/src/test/java/com/google/protobuf/DescriptorsTest.java

java/src/test/java/com/google/protobuf/GeneratedMessageTest.java

java/src/test/java/com/google/protobuf/LiteTest.java

java/src/test/java/com/google/protobuf/ServiceTest.java

java/src/test/java/com/google/protobuf/TestUtil.java

java/src/test/java/com/google/protobuf/TextFormatTest.java

java/src/test/java/com/google/protobuf/multiple_files_test.proto

ltmain.sh

m4/acx_pthread.m4

m4/libtool.m4

m4/ltoptions.m4

m4/ltversion.m4

m4/lt~obsolete.m4

m4/stl_hash.m4

python/README.txt

python/ez_setup.py

python/google/protobuf/descriptor.py

python/google/protobuf/internal/containers.py

python/google/protobuf/internal/decoder.py

python/google/protobuf/internal/encoder.py

python/google/protobuf/internal/generator_test.py

python/google/protobuf/internal/message_test.py

python/google/protobuf/internal/reflection_test.py

python/google/protobuf/internal/text_format_test.py

python/google/protobuf/message.py

python/google/protobuf/reflection.py

python/google/protobuf/text_format.py

python/mox.py

python/setup.py

python/stubout.py

src/Makefile.am

src/Makefile.in

src/google/protobuf/compiler/code_generator.cc

src/google/protobuf/compiler/code_generator.h

src/google/protobuf/compiler/command_line_interface.cc

src/google/protobuf/compiler/command_line_interface.h

src/google/protobuf/compiler/command_line_interface_unittest.cc

src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc

src/google/protobuf/compiler/cpp/cpp_enum_field.cc

src/google/protobuf/compiler/cpp/cpp_file.cc

src/google/protobuf/compiler/cpp/cpp_generator.cc

src/google/protobuf/compiler/cpp/cpp_generator.h

src/google/protobuf/compiler/cpp/cpp_helpers.cc

src/google/protobuf/compiler/cpp/cpp_helpers.h

src/google/protobuf/compiler/cpp/cpp_message.cc

src/google/protobuf/compiler/cpp/cpp_message_field.cc

src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc

src/google/protobuf/compiler/cpp/cpp_primitive_field.cc

src/google/protobuf/compiler/cpp/cpp_string_field.cc

src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto

src/google/protobuf/compiler/cpp/cpp_unittest.cc

src/google/protobuf/compiler/importer.cc

src/google/protobuf/compiler/java/java_enum.cc

src/google/protobuf/compiler/java/java_enum_field.cc

src/google/protobuf/compiler/java/java_enum_field.h

src/google/protobuf/compiler/java/java_extension.cc

src/google/protobuf/compiler/java/java_extension.h

src/google/protobuf/compiler/java/java_field.cc

src/google/protobuf/compiler/java/java_field.h

src/google/protobuf/compiler/java/java_file.cc

src/google/protobuf/compiler/java/java_file.h

src/google/protobuf/compiler/java/java_generator.cc

src/google/protobuf/compiler/java/java_generator.h

src/google/protobuf/compiler/java/java_helpers.cc

src/google/protobuf/compiler/java/java_helpers.h

src/google/protobuf/compiler/java/java_message.cc

src/google/protobuf/compiler/java/java_message.h

src/google/protobuf/compiler/java/java_message_field.cc

src/google/protobuf/compiler/java/java_message_field.h

src/google/protobuf/compiler/java/java_plugin_unittest.cc

src/google/protobuf/compiler/java/java_primitive_field.cc

src/google/protobuf/compiler/java/java_primitive_field.h

src/google/protobuf/compiler/java/java_service.cc

src/google/protobuf/compiler/mock_code_generator.cc

src/google/protobuf/compiler/mock_code_generator.h

src/google/protobuf/compiler/parser.cc

src/google/protobuf/compiler/parser.h

src/google/protobuf/compiler/parser_unittest.cc

src/google/protobuf/compiler/plugin.cc

src/google/protobuf/compiler/plugin.h

src/google/protobuf/compiler/plugin.pb.cc

src/google/protobuf/compiler/plugin.pb.h

src/google/protobuf/compiler/plugin.proto

src/google/protobuf/compiler/python/python_generator.cc

src/google/protobuf/compiler/python/python_generator.h

src/google/protobuf/compiler/python/python_plugin_unittest.cc

src/google/protobuf/compiler/subprocess.cc

src/google/protobuf/compiler/subprocess.h

src/google/protobuf/compiler/zip_output_unittest.sh

src/google/protobuf/compiler/zip_writer.cc

src/google/protobuf/compiler/zip_writer.h

src/google/protobuf/descriptor.cc

src/google/protobuf/descriptor.pb.cc

src/google/protobuf/descriptor.pb.h

src/google/protobuf/descriptor.proto

src/google/protobuf/descriptor_database.cc

src/google/protobuf/descriptor_unittest.cc

src/google/protobuf/extension_set.cc

src/google/protobuf/extension_set.h

src/google/protobuf/generated_message_reflection.cc

src/google/protobuf/generated_message_util.cc

src/google/protobuf/generated_message_util.h

src/google/protobuf/io/coded_stream.cc

src/google/protobuf/io/coded_stream.h

src/google/protobuf/io/coded_stream_unittest.cc

src/google/protobuf/io/gzip_stream.cc

src/google/protobuf/io/printer.cc

src/google/protobuf/io/printer.h

src/google/protobuf/io/tokenizer.cc

src/google/protobuf/io/tokenizer.h

src/google/protobuf/io/tokenizer_unittest.cc

src/google/protobuf/io/zero_copy_stream_unittest.cc

src/google/protobuf/message.h

src/google/protobuf/repeated_field.cc

src/google/protobuf/repeated_field.h

src/google/protobuf/repeated_field_unittest.cc

src/google/protobuf/stubs/common.cc

src/google/protobuf/stubs/common.h

src/google/protobuf/stubs/common_unittest.cc

src/google/protobuf/stubs/strutil.h

src/google/protobuf/text_format.cc

src/google/protobuf/text_format.h

src/google/protobuf/text_format_unittest.cc

src/google/protobuf/unittest.proto

src/google/protobuf/unittest_custom_options.proto

src/google/protobuf/unittest_no_generic_services.proto

src/google/protobuf/wire_format_lite_inl.h

vsprojects/libprotobuf-lite.vcproj

vsprojects/libprotobuf.vcproj

vsprojects/libprotoc.vcproj

vsprojects/protobuf.sln

vsprojects/protoc.vcproj

vsprojects/test_plugin.vcproj

Show diffs side-by-side

added added

removed removed

src/google/protobuf/extension_set.h

#define GOOGLE_PROTOBUF_EXTENSION_SET_H__

#include <vector>

#include <stack>

#include <map>

#include <utility>

#include <string>

#include <google/protobuf/stubs/common.h>

namespace google {

214

215

bool Has(int number) const;

216

int ExtensionSize(int number) const; // Size of a repeated extension.

217

FieldType ExtensionType(int number) const;

217

218

void ClearExtension(int number);

218

219

220

// singular fields -------------------------------------------------

451

452

int SpaceUsedExcludingSelf() const;

452

453

};

453

454

455

454

456

// Gets the extension with the given number, creating it if it does not

455

457

// already exist. Returns true if the extension did not already exist.

456

458

bool MaybeNewExtension(int number, const FieldDescriptor* descriptor,

Older »