aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Generate a package name suffix ".nano" for nano messagesXiao Hang2015-07-295-58/+174
| | | | Also introducing an option javanano_use_deprecated_package to allow users to disable the suffix
* Remove two unused functions.Nico Weber2015-07-252-16/+0
|
* Merge pull request #621 from nico/staticassJisi Liu2015-07-201-2/+4
|\ | | | | Let GOOGLE_COMPILE_ASSERT use static_assert if available.
| * Let GOOGLE_COMPILE_ASSERT use static_assert if available.Nico Weber2015-07-171-2/+4
| | | | | | | | | | | | | | | | | | | | The motivation is that gcc 4.8+ and clang trunk warn on unused local typedefs, which COMPILE_ASSERT adds. After this change, the warning will be happy at least in C++11 builds. static_assert also produces a slighly nicer diagnostic than the typedef method. https://github.com/google/re2/commit/eb93e8bc43ac8d05322fb3e9fc885898ad924f8a did the same change in re2.
* | Merge pull request #604 from haberman/ruby-conformanceJoshua Haberman2015-07-202-16/+24
|\ \ | | | | | | Added Ruby to conformance tests.
| * | Added Ruby to conformance tests.Josh Haberman2015-07-162-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involved fixing a few important bugs in the Ruby implementation -- mostly cases of mixing upb field types and descriptor types (upb field types do not distinguish between int/sint/fixed/sfixed like descriptor types do). Also added protobuf-specific exceptions so parse errors can be caught specifically. Change-Id: Ib49d3db976900b2c6f3455c8b88af52cfb86e036
* | | Merge pull request #622 from pherl/splitheadersJisi Liu2015-07-172-0/+2
|\ \ \ | |_|/ |/| | Addming missing includes in stubs headers.
| * | Addming missing includes in stubs headers.Jisi Liu2015-07-172-0/+2
| | | | | | | | | | | | | | | | | | This is to prepare removing those additional headers in common.h Change-Id: I707d6d8eaf193eb28195a827c7fec738b968ab3e
* | | Merge pull request #613 from pherl/splitheadersJisi Liu2015-07-179-1404/+1631
|\| | | | | | | | Split up common.h headers
| * | Merge branch 'master' of github.com:google/protobuf into splitheaderJisi Liu2015-07-171-0/+3
| |\ \ | | | | | | | | | | | | Change-Id: I5f6cbc2430200e3751ad754cc7ae604338db6f91
| * | | Update make file for extra headers.Jisi Liu2015-07-171-0/+6
| | | | | | | | | | | | | | | | Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22
| * | | Split up common.h headersJisi Liu2015-07-168-1404/+1625
| | |/ | |/| | | | | | | Change-Id: I223783111d743aa5193bf70fa1b9b54c7b4389c3
* | | Merge pull request #601 from anandolee/masterJie Luo2015-07-172-0/+35
|\ \ \ | |_|/ |/| | ignore UTF-8 BOM
| * | ignore UTF-8 BOM if it is in the begining of a proto fileJie Luo2015-07-162-0/+35
| |/
* / Install missing headersRob Earhart2015-07-141-0/+3
|/ | | | | | Install google/protobuf/stubs/status.h, and google/protobuf/stubs/stringpiece.h -- these are required in order to include google/protobuf/util/type_resolver.h. Install google/protobuf/stubs/bytestream.h -- this is required in order to include google/protobuf/util/json_util.h.
* Internal local modifications.Bo Yang2015-07-0910-158/+160
|
* Merge pull request #500 from TeBoring/tempPaul Yang2015-07-013-62/+94
|\ | | | | Implement parsing for proto3 primitive repeated fields.
| * Implement parsing for proto3 primitive repeated fields. Previously, forBo Yang2015-06-153-62/+94
| | | | | | | | | | proto3 primitive repeated fields, packed data cannot be parsed if definition is unpacked. Neither is the other way.
* | Merge pull request #551 from ostrovsky/masterFeng Xiao2015-07-016-31/+21
|\ \ | | | | | | MinGW64+MSYS2 compilation issues
| * | MinGW64+MSYS2 compilation issues and portable isnan using MathLimitsKarol Ostrovsky2015-07-016-31/+21
| | |
* | | Merge pull request #458 from xfxyjwf/memory_leakPaul Yang2015-06-301-0/+5
|\ \ \ | | | | | | | | Delete default UnknownFieldSet when shuting down.
| * | | Delete default UnknownFieldSet when shuting down.Feng Xiao2015-06-021-0/+5
| | | |
* | | | Fix "sometimes-uninitialized" warning on Windows Clang.Matt Giuca2015-06-301-1/+1
| |/ / |/| |
* | | fix compiler warnings.Jisi Liu2015-06-243-11/+6
| | | | | | | | | | | | | | | | | | | | | - control reaches end of non-void function. - remove a deprecated IsMatch. Change-Id: Ifdeb15879bbcf591c48dc7fda1cd8994bdf87bb3
* | | Merge pull request #503 from thomasvl/add_nonnill_markupPaul Yang2015-06-192-9/+13
|\ \ \ | | | | | | | | Add nonnull/nullable/null_resettable markup to ObjC library.
| * | | Add nonnil markup to ObjC library.Thomas Van Lenten2015-06-162-9/+13
| | |/ | |/| | | | | | | Add the clang annotations to the objc library and generated code to help with Swift bridging and compiler checks.
* | | using ::isnan to avoid conflicts with std::isnan for C++11 build.Jisi Liu2015-06-181-1/+1
| | | | | | | | | | | | Change-Id: I057b44eff04c3b0062a4fd4307ce6e4ca1eb952b
* | | Merge pull request #501 from xfxyjwf/downFeng Xiao2015-06-1792-154/+28178
|\ \ \ | | | | | | | | Down-integrate from internal code base.
| * | | Fix broken builds.Feng Xiao2015-06-1726-128/+170
| | | |
| * | | Down-integrate from internal code base.Feng Xiao2015-06-1592-150/+28132
| |/ / | | | | | | | | | | | | | | | [ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
* / / Make the code independent of config.hJisi Liu2015-06-167-14/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Now the Build tool needs to define -DHAVE_ZLIB and -DHAVE-PTHREAD rather than providing a config.h - Make pbconfig.h a manually written file to handle hash conditions according to platform related macros. - Remove #include "config.h" from source code. - Changed the configure.ac and Makefile.am to pass down the macros. - Change cmake to pass down the the macros. Change-Id: I537249d5df8fdeba189706aec436d1ab1104a4dc
* | Merge pull request #488 from AustinSchuh/ruby_test_fixFeng Xiao2015-06-151-0/+4
|\ \ | | | | | | Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUF
| * | Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUFAustin Schuh2015-06-101-0/+4
| | |
* | | Merge pull request #495 from pherl/masterJisi Liu2015-06-132-18/+145
|\ \ \ | | | | | | | | Make pbconfig.h independent of config.h
| * | | Make pbconfig.h independent of config.hJisi Liu2015-06-132-18/+145
| |/ / | | | | | | | | | Change-Id: I31ead985b4ac5b02fb7558d34c1da19fd837b50a
* | | Merge pull request #481 from Qartar/masterFeng Xiao2015-06-123-15/+61
|\ \ \ | | | | | | | | Workaround for MSVC's string literal compiler limit.
| * | | Workaround for MSVC's string literal compiler limit.Qartar2015-06-123-15/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape characters don't count for string literal size, no need to pre-generate escape string. Added unit test to touch enormous cpp generated descriptor. Updated makefile to include enormous_descriptor.proto Fixed language compatibility error.
* | | | Give descriptor.proto a go packageTamir Duberstein2015-06-122-3/+5
| |/ / |/| | | | | | | | | | | This is currently done in golang/protobuf using `sed`. This change should simplify things.
* | | Merge pull request #480 from thomasvl/objc_beta_dropPaul Yang2015-06-0914-554/+355
|\ \ \ | | | | | | | | Beta quality drop of Objective C Support.
| * | | Beta quality drop of Objective C Support.Thomas Van Lenten2015-06-0814-554/+355
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add more to the ObjC dir readme. - Merge the ExtensionField and ExtensionDescriptor to reduce overhead. - Fix an initialization race. - Clean up the Xcode schemes. - Remove the class/enum filter. - Remove some forced inline that were bloating things without proof of performance wins. - Rename some internal types to avoid conflicts with the well know types protos. - Drop the use of ApplyFunctions to the compiler/optimizer can do what it wants. - Better document some possible future improvements. - Add missing support for parsing repeated primitive fields in packed or unpacked forms. - Improve -hash. - Add *Count for repeated and map<> fields to avoid auto create when checking for them being set.
* / / Refactored threadlocal logic.Austin Schuh2015-06-085-9/+15
|/ / | | | | | | | | | | | | Refactored the threadlocal logic for Android and IOS into logic in platform_macro.h which computes a GOOGLE_PROTOBUF_NO_THREADLOCAL define which is then used elsewhere. This allows new platforms without THREADLOCAL to be easily defined.
* | Merge pull request #468 from AustinSchuh/unsigned_protoFeng Xiao2015-06-063-19/+19
|\ \ | | | | | | Marked another compiler literal unsigned.
| * | Marked another compiler literal unsigned.Austin Schuh2015-06-053-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling a protobuf with gcc 4.1.2 for powerpc, I ran into another of the following warning message: INFO: From Compiling my_proto.pb.cc powerpc-603e-linux-gcc: bazel-out/local_linux-dbg/genfiles/my_proto.pb.cc: In member function `virtual void MyProto::Clear()': bazel-out/local_linux-dbg/genfiles/my_proto.pb.cc:223: warning: this decimal constant is unsigned only in ISO C90 The line in the proto file that was triggering it was: if (_has_bits_[24 / 32] & 4278190080) { ZR_(field1_, field2_); } _has_bits_ is a uint32. The constant mask should therefore be unsigned. This change updates the constant to be generated as unsigned.
* | | Fixed bug in GOOGLE_PREDICT_FALSE.Austin Schuh2015-06-051-1/+1
|/ / | | | | | | | | | | | | The GOOGLE_PREDICT_FALSE macro is both incorrect, and doesn't match the macro definition in glog, which causes conflicts when including both libraries. This commit fixes that by making it identical to what is in glog.
* | Merge pull request #462 from anandolee/masterJie Luo2015-06-0425-1632/+1846
|\ \ | | | | | | Migrate writer to printer for C#
| * | Migrate writer to io::Printer for C#Jie Luo2015-06-0425-1632/+1846
| | |
* | | Merge pull request #457 from xfxyjwf/cmakeFeng Xiao2015-06-041-11/+8
|\ \ \ | | | | | | | | Add cmake support.
| * | | Add cmake support.Feng Xiao2015-05-311-11/+8
| | | |
* | | | Merge pull request #453 from bakineggs/masterFeng Xiao2015-06-031-0/+14
|\ \ \ \ | |_|_|/ |/| | | Add protoc path detection for Mac OS
| * | | Add protoc path detection for Mac OSDan Barry2015-06-021-0/+14
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-16 18:05:14 +0000