aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Down-integrate from internal code base.Gravatar Feng Xiao2014-11-20
|
* Add nano proto authors and update LICENSE file to include Android.mk.Gravatar Feng Xiao2014-11-20
|
* Merge pull request #91 from xfxyjwf/android_nanoGravatar Feng Xiao2014-11-20
|\ | | | | Merge nano proto into protobuf repository.
| * Fix the broken link at the bottom of javanano/README.txtGravatar Feng Xiao2014-11-20
| |
* | Merge pull request #79 from xfxyjwf/licenseGravatar Feng Xiao2014-11-20
|\ \ | | | | | | Update LICENSE to list files that aren't copyrighted by Google Inc.
| | * Merge nano proto into protobuf repository.Gravatar Feng Xiao2014-11-19
| |/| |/| | | | | | | | Source: https://android.googlesource.com/platform/external/protobuf.git
| | * Prepare nano proto code to be merged into protobuf repository.Gravatar Feng Xiao2014-11-19
| | |
* | | Merge pull request #89 from tseaver/ignore-map_generated_filesGravatar Feng Xiao2014-11-18
|\ \ \ | | | | | | | | Ignore files generated from new 'map*.protobuf' sources.
| * | | Ignore files generated from new 'map*.protobuf' sources.Gravatar Tres Seaver2014-11-18
|/ / /
* | | Merge pull request #88 from tseaver/fix-class_key_must_be_declared_w_friendGravatar Feng Xiao2014-11-18
|\ \ \ | | | | | | | | Fix compiler error: "a class-key must be used when declaring a friend"
| * | | Fix testcase compile failure under gcc 4.6:Gravatar Tres Seaver2014-11-18
| | | | | | | | | | | | | | | | | | | | | | | | google/protobuf/map_test.cc:88:16: error: expected ‘;’ at end of member declaration google/protobuf/map_test.cc:88:18: error: ‘override’ does not name a type .
| * | | Fix 'error: a class-key must be used when declaring a friend' compile error.Gravatar Tres Seaver2014-11-18
| | | |
| * | | Merge remote-tracking branch 'upstream/master'Gravatar Tres Seaver2014-11-18
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #86 from tseaver/compat_w_git_lt_1.8Gravatar Feng Xiao2014-11-17
|\ \ \ \ | | | | | | | | | | Make .gitignore more robust
* \ \ \ \ Merge pull request #84 from tseaver/fix_80-avoid_INT32_MAX_MINGravatar Feng Xiao2014-11-17
|\ \ \ \ \ | | | | | | | | | | | | Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.
| | * | | | Avoid '**/' patterns for compat w/ git < 1.8.Gravatar Tres Seaver2014-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore generated test scaffolding files. Exclude Python build artifacts.
| * | | | | Use 'kint32min'/'kint32max' constants, rather than defining locally.Gravatar Tres Seaver2014-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporates feedback from @xfxyjwf: https://github.com/google/protobuf/pull/84#discussion_r20474781.
| | | * | | Exclude Python build artifacts.Gravatar Tres Seaver2014-11-17
| | | | | |
| * | | | | Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.Gravatar Tres Seaver2014-11-17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Define safe constants to use when padding enums. Fixes #80.
| | * | | Ignore generated test scaffolding files.Gravatar Tres Seaver2014-11-17
| | | | |
| | * | | Compat w/ git < 1.8.Gravatar Tres Seaver2014-11-17
| |/ / /
* / / / Down-integrate from internal code base (C++ maps support).Gravatar Feng Xiao2014-11-14
|/ / /
| * / Update LICENSE to list files that aren't copyrighted by Google Inc.Gravatar Feng Xiao2014-11-11
|/ / | | | | | | | | This is following what V8 does: https://code.google.com/p/v8/source/browse/trunk/LICENSE
* | Merge pull request #69 from apaprocki/aix-atomicopsGravatar Feng Xiao2014-11-11
|\ \ | | | | | | Add AIX/POWER atomicops and fix compilation with IBM xlC C++ compiler.
| * | Modify tests to compile on AIX with xlC compiler.Gravatar Andrew Paprocki2014-11-11
| | | | | | | | | | | | | | | - `int64` typedef collision with `sys/inttypes.h` - `xlC` complains about `int` and pointer comparisons without casts
| * | Added contributor and updated README to add AIX.Gravatar Andrew Paprocki2014-11-11
| | |
| * | Add atomicops for AIX/POWER + IBM xlC compiler.Gravatar Andrew Paprocki2014-11-11
| | |
| | * Merge "Add platform versions of the protobuf libraries."Gravatar Dan Albert2014-11-11
| | |\
| | | * Add platform versions of the protobuf libraries.Gravatar Dan Albert2014-11-11
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | NDK libraries should not be linked in to platform code, so create a separate version for the platform that is linked against libc++ instead of the NDK STLs. Bug: 15193147 Change-Id: I3935e5dd3bd99676772a4b9681e275ef3601b855
* | | Merge branch 'typofixes-vlajos-20141108' of ↵Gravatar Feng Xiao2014-11-11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/vlajos/protobuf into typo Conflicts: src/google/protobuf/compiler/java/java_file.cc
* | | | Down-integrate from internal code base.Gravatar Feng Xiao2014-11-10
| | | |
| * | | typo fixes - https://github.com/vlajos/misspell_fixerGravatar Veres Lajos2014-11-08
|/ / /
* | | Adds more checks before deleting temporary files.Gravatar Feng Xiao2014-11-08
| | |
* | | Merge pull request #50 from dlitz/compat-py3kGravatar Feng Xiao2014-11-08
|\ \ \ | | | | | | | | setup.py fixes for Python 3
| | | * am dbb9c303: Merge "Added an API method in FieldData to allow access to the ↵Gravatar Behrooz Khorashadi2014-11-06
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UnknownField data" * commit 'dbb9c3033097e571e15c16d6e2e814be7e9d60bc': Added an API method in FieldData to allow access to the UnknownField data
| | | | * Merge "Added an API method in FieldData to allow access to the UnknownField ↵Gravatar Behrooz Khorashadi2014-11-06
| | | | |\ | | | | | | | | | | | | | | | | | | data"
* | | | | \ Merge pull request #71 from abyss7/masterGravatar Feng Xiao2014-11-05
|\ \ \ \ \ \ | | | | | | | | | | | | | | Silence -Wsign-compare warning on Mac
| | | | | | * Added an API method in FieldData to allow access to the UnknownField dataGravatar Behrooz Khorashadi2014-11-05
| | | | | |/ | | | | | | | | | | | | | | | | | | Change-Id: I2cd5cfc80dce2a297fcd2511074b2a9d23d39837
* | | | | | Merge pull request #70 from AustinSchuh/masterGravatar Feng Xiao2014-11-05
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed Unused Parameter warning in headers.
* \ \ \ \ \ \ Merge pull request #72 from Steelskin/masterGravatar Feng Xiao2014-11-05
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Change references to `vector` to use `std::vector`
* | | | | | | | Corrected code example in coded_stream.hGravatar acidtonic2014-11-04
| | | | | | | | | | | | | | | | | | | | | | | | There is an example at the top of the page which contains code that appears to show a user how to create and serialize a message to a file. However the flags to open the file lack the O_CREAT flag which allows creating the file if it doesn't exist. I was troubleshooting a situation where this snippet was used and compiled, but never created a file.
| * | | | | | | Change references to `vector` to use `std::vector`Gravatar Fabrice de Gans-Riberi2014-11-03
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstreaming patch used by Chromium in https://codereview.chromium.org/693773003/
| | * / / / / Silence -Wsign-compare warning on MacGravatar abyss72014-11-03
| |/ / / / / |/| | | | |
| * | | | | Fixed Unused Parameter warning in compiler headers.Gravatar Austin Schuh2014-10-31
| | | | | |
| * | | | | Fixed Unused Parameter warning in headers.Gravatar Austin Schuh2014-10-31
|/ / / / /
| | * / / Fixed IBM xlC compiler error due to missing prefix.Gravatar Andrew Paprocki2014-10-31
| |/ / / |/| | |
| | * | am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts."Gravatar Jeff Davidson2014-10-29
| | |\| | | | | | | | | | | | | | | | | * commit '1ed1ec3609812a7818689cde01b6ce92d3f2315a': Move protobuf 2.3.0 to prebuilts.
| | | * Merge "Move protobuf 2.3.0 to prebuilts."Gravatar Jeff Davidson2014-10-28
| | | |\
* | | | | Add the missing solaris atomics header file.Gravatar Feng Xiao2014-10-22
| | | | |
| | | | * Move protobuf 2.3.0 to prebuilts.Gravatar Jeff Davidson2014-10-22
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will facilitate an upgrade to 2.6.0 and future versions without breaking applications which have a hardcoded dependency on 2.3.0. The existing make rules have been renamed to omit the version code. The prebuilts were built from a tree at commit 9be7e7401174d75e87e21fdc5f43549594a714bb. Change-Id: I90cf7f029217c8dc63a4b38252025c6b725d72a5
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 18:24:50 +0000