aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #89 from tseaver/ignore-map_generated_filesFeng Xiao2014-11-181-0/+1
|\ | | | | Ignore files generated from new 'map*.protobuf' sources.
| * Ignore files generated from new 'map*.protobuf' sources.Tres Seaver2014-11-181-0/+1
|/
* Merge pull request #88 from tseaver/fix-class_key_must_be_declared_w_friendFeng Xiao2014-11-182-2/+2
|\ | | | | Fix compiler error: "a class-key must be used when declaring a friend"
| * Fix testcase compile failure under gcc 4.6:Tres Seaver2014-11-181-1/+1
| | | | | | | | | | | | 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.Tres Seaver2014-11-181-1/+1
| |
| * Merge remote-tracking branch 'upstream/master'Tres Seaver2014-11-1891-3168/+8300
| |\ | |/ |/|
* | Merge pull request #86 from tseaver/compat_w_git_lt_1.8Feng Xiao2014-11-171-7/+19
|\ \ | | | | | | Make .gitignore more robust
| * | Avoid '**/' patterns for compat w/ git < 1.8.Tres Seaver2014-11-171-7/+19
| | | | | | | | | | | | | | | | | | Ignore generated test scaffolding files. Exclude Python build artifacts.
* | | Merge pull request #84 from tseaver/fix_80-avoid_INT32_MAX_MINFeng Xiao2014-11-174-5/+2
|\ \ \ | | | | | | | | Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.
| * | | Use 'kint32min'/'kint32max' constants, rather than defining locally.Tres Seaver2014-11-174-20/+2
| | | | | | | | | | | | | | | | | | | | Incorporates feedback from @xfxyjwf: https://github.com/google/protobuf/pull/84#discussion_r20474781.
| * | | Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.Tres Seaver2014-11-174-5/+20
| |/ / | | | | | | | | | | | | | | | Define safe constants to use when padding enums. Fixes #80.
* / / Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-1490-3163/+8298
|/ /
| * Exclude Python build artifacts.Tres Seaver2014-11-171-0/+7
| |
| * Ignore generated test scaffolding files.Tres Seaver2014-11-171-0/+5
| |
| * Compat w/ git < 1.8.Tres Seaver2014-11-171-7/+7
|/
* Merge pull request #69 from apaprocki/aix-atomicopsFeng Xiao2014-11-118-6/+480
|\ | | | | Add AIX/POWER atomicops and fix compilation with IBM xlC C++ compiler.
| * Modify tests to compile on AIX with xlC compiler.Andrew Paprocki2014-11-112-2/+5
| | | | | | | | | | - `int64` typedef collision with `sys/inttypes.h` - `xlC` complains about `int` and pointer comparisons without casts
| * Added contributor and updated README to add AIX.Andrew Paprocki2014-11-112-0/+11
| |
| * Add atomicops for AIX/POWER + IBM xlC compiler.Andrew Paprocki2014-11-113-0/+459
| |
| * Fixed IBM xlC compiler error due to missing prefix.Andrew Paprocki2014-10-311-4/+5
| |
* | Merge branch 'typofixes-vlajos-20141108' of ↵Feng Xiao2014-11-1121-49/+49
|\ \ | | | | | | | | | | | | | | | | | | https://github.com/vlajos/protobuf into typo Conflicts: src/google/protobuf/compiler/java/java_file.cc
| * | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-0822-50/+50
| | |
* | | Down-integrate from internal code base.Feng Xiao2014-11-10255-4893/+25099
|/ /
* | Adds more checks before deleting temporary files.Feng Xiao2014-11-083-2/+8
| |
* | Merge pull request #50 from dlitz/compat-py3kFeng Xiao2014-11-081-2/+11
|\ \ | | | | | | setup.py fixes for Python 3
| * | Omit google-apputils dependency under Python 3Dwayne Litzenberger2014-10-141-1/+5
| | | | | | | | | | | | Temporary change until a py3k-compatible google-apputils is released.
| * | Use 2to3 when building under Python 3.Dwayne Litzenberger2014-10-141-1/+6
| | |
* | | Merge pull request #71 from abyss7/masterFeng Xiao2014-11-051-1/+1
|\ \ \ | | | | | | | | Silence -Wsign-compare warning on Mac
| * | | Silence -Wsign-compare warning on Macabyss72014-11-031-1/+1
| | |/ | |/|
* | | Merge pull request #70 from AustinSchuh/masterFeng Xiao2014-11-054-17/+19
|\ \ \ | | | | | | | | Fixed Unused Parameter warning in headers.
| * | | Fixed Unused Parameter warning in compiler headers.Austin Schuh2014-10-311-5/+6
| | | |
| * | | Fixed Unused Parameter warning in headers.Austin Schuh2014-10-313-12/+13
| |/ /
* | | Merge pull request #72 from Steelskin/masterFeng Xiao2014-11-052-2/+2
|\ \ \ | | | | | | | | Change references to `vector` to use `std::vector`
| * | | Change references to `vector` to use `std::vector`Fabrice de Gans-Riberi2014-11-032-2/+2
| |/ / | | | | | | | | | | | | Upstreaming patch used by Chromium in https://codereview.chromium.org/693773003/
* / / Corrected code example in coded_stream.hacidtonic2014-11-041-1/+1
|/ / | | | | 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.
* | Add the missing solaris atomics header file.Feng Xiao2014-10-221-1/+2
| |
* | Update version number to 2.6.2-pre.Feng Xiao2014-10-217-10/+10
| |
* | Merge changes from 2.6.1 release branch.Feng Xiao2014-10-214-5/+5
|\ \
| * | Update version number to 2.6.1.v2.6.1Feng Xiao2014-10-204-5/+5
| |/
* / Add .gitignore fileJohn Beard2014-10-161-0/+49
|/ | | | | | | Includes files generated by each of: * autogen.sh * configure * make
* Don't test for sched_yield on WindowsWilliam Orr2014-10-101-2/+8
|
* Update CHANGES.txt to include a bug fix.v2.6.1rc1Feng Xiao2014-10-091-0/+1
|
* Update version number in generated files.Feng Xiao2014-10-092-2/+2
|
* Update CHANGES.txt for 2.6.1rc1.Feng Xiao2014-10-091-0/+17
|
* Merge remote-tracking branch 'origin/master' into 2.6.1Feng Xiao2014-10-092-0/+17
|\
| * Merge pull request #43 from abuszta/bugfixFeng Xiao2014-10-092-0/+17
| |\ | | | | | | Release objects allocated by InitializeDefaultRepeatedFields()
| | * DestroyDefaultRepeatedFields is registered using OnShutdown.Antoni Buszta2014-10-091-3/+1
| | |
| | * InitializeDefaultRepeatedFields() allocates memory but does not release it.Antoni Buszta2014-10-082-0/+19
| | |
* | | Update version number to 2.6.1rc1Feng Xiao2014-10-085-8/+8
|/ /
* | Avoid using the macro name again in macro definitions.Feng Xiao2014-10-081-3/+3
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 15:40:02 +0000