Commit graph

443 commits

Author SHA1 Message Date
Tres Seaver
706690bddb Ignore generated test scaffolding files. 2014-11-17 11:22:59 -05:00
Tres Seaver
e8e3a5bf96 Compat w/ git < 1.8. 2014-11-17 11:20:19 -05:00
Feng Xiao
faf581d208 Merge pull request #69 from apaprocki/aix-atomicops
Add AIX/POWER atomicops and fix compilation with IBM xlC C++ compiler.
2014-11-11 14:24:28 -08:00
Andrew Paprocki
af88ccb5fc Modify tests to compile on AIX with xlC compiler.
- `int64` typedef collision with `sys/inttypes.h`
- `xlC` complains about `int` and pointer comparisons without casts
2014-11-11 15:36:23 -05:00
Andrew Paprocki
1ddf6937ee Added contributor and updated README to add AIX. 2014-11-11 15:36:21 -05:00
Andrew Paprocki
ebb41981c8 Add atomicops for AIX/POWER + IBM xlC compiler. 2014-11-11 15:36:21 -05:00
Feng Xiao
643d09ac7d Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobuf into typo
Conflicts:
	src/google/protobuf/compiler/java/java_file.cc
2014-11-11 11:01:32 -08:00
Feng Xiao
6ef984af4b Down-integrate from internal code base. 2014-11-10 17:34:54 -08:00
Veres Lajos
c76807211a typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-08 22:59:34 +00:00
Feng Xiao
baca1a8a1a Adds more checks before deleting temporary files. 2014-11-08 02:40:18 -05:00
Feng Xiao
ad7f41bd57 Merge pull request #50 from dlitz/compat-py3k
setup.py fixes for Python 3
2014-11-08 02:25:53 -05:00
Feng Xiao
a270576f53 Merge pull request #71 from abyss7/master
Silence -Wsign-compare warning on Mac
2014-11-05 16:42:13 -05:00
Feng Xiao
3e0ec8de2b Merge pull request #70 from AustinSchuh/master
Fixed Unused Parameter warning in headers.
2014-11-05 11:24:25 -05:00
Feng Xiao
11e6e9a3b0 Merge pull request #72 from Steelskin/master
Change references to `vector` to use `std::vector`
2014-11-05 11:20:53 -05:00
acidtonic
2ba455f20c Corrected code example in coded_stream.h
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.
2014-11-04 10:10:54 -05:00
Fabrice de Gans-Riberi
98db4958f0 Change references to vector to use std::vector
Upstreaming patch used by Chromium in
https://codereview.chromium.org/693773003/
2014-11-03 13:48:42 +01:00
abyss7
717f807499 Silence -Wsign-compare warning on Mac 2014-11-03 10:20:08 +03:00
Austin Schuh
ec71d5d319 Fixed Unused Parameter warning in compiler headers. 2014-10-31 19:15:54 -07:00
Austin Schuh
918e3ee8b4 Fixed Unused Parameter warning in headers. 2014-10-31 16:27:55 -07:00
Andrew Paprocki
4eaa16f7a9 Fixed IBM xlC compiler error due to missing prefix. 2014-10-31 16:47:24 -04:00
Feng Xiao
53d202f587 Add the missing solaris atomics header file. 2014-10-22 11:33:55 -07:00
Feng Xiao
df5481c6b3 Update version number to 2.6.2-pre. 2014-10-21 16:47:33 -07:00
Feng Xiao
f9e623b167 Merge changes from 2.6.1 release branch. 2014-10-21 16:36:59 -07:00
Feng Xiao
bba83652e1 Update version number to 2.6.1. 2014-10-20 17:06:06 -07:00
John Beard
2853cd4a10 Add .gitignore file
Includes files generated by each of:
   * autogen.sh
   * configure
   * make
2014-10-16 12:57:15 +01:00
Dwayne Litzenberger
b460610b69 Omit google-apputils dependency under Python 3
Temporary change until a py3k-compatible google-apputils is released.
2014-10-14 13:50:52 -07:00
Dwayne Litzenberger
0fd260eae7 Use 2to3 when building under Python 3. 2014-10-14 13:47:11 -07:00
William Orr
20e0a61ff6 Don't test for sched_yield on Windows 2014-10-10 22:50:39 -07:00
Feng Xiao
419c94b6e0 Update CHANGES.txt to include a bug fix. 2014-10-09 11:40:02 -07:00
Feng Xiao
8c12b1af76 Update version number in generated files. 2014-10-09 11:31:47 -07:00
Feng Xiao
57b86729f2 Update CHANGES.txt for 2.6.1rc1. 2014-10-09 11:20:08 -07:00
Feng Xiao
5ac39f34ae Merge remote-tracking branch 'origin/master' into 2.6.1 2014-10-09 10:27:01 -07:00
Feng Xiao
5452bd6e39 Merge pull request #43 from abuszta/bugfix
Release objects allocated by InitializeDefaultRepeatedFields()
2014-10-09 10:25:47 -07:00
Antoni Buszta
e670b67032 DestroyDefaultRepeatedFields is registered using OnShutdown. 2014-10-09 07:16:04 +02:00
Feng Xiao
d9d1da95c6 Update version number to 2.6.1rc1 2014-10-08 18:44:37 -07:00
Feng Xiao
3b8dadf581 Avoid using the macro name again in macro definitions. 2014-10-08 17:32:53 -07:00
Feng Xiao
06e6690bf2 Fix the memory leak of GetEmptyString(). 2014-10-08 17:28:03 -07:00
Antoni Buszta
e83ba13a6f InitializeDefaultRepeatedFields() allocates memory but does not release it. 2014-10-08 11:27:18 +02:00
Feng Xiao
0971bb0d57 Down-integrate from internal branch. 2014-10-07 17:44:48 -07:00
Feng Xiao
c1d16457db Merge pull request #35 from dsrosario/fix_warning
Fix "warning C4018: '<' : signed/unsigned mismatch"
2014-10-06 14:12:21 -07:00
Feng Xiao
56aa52d986 Merge pull request #38 from xfxyjwf/fix17
Fix a bug that causes DynamicMessage.setField() to not work for repeated enum fields.
2014-10-03 11:24:42 -07:00
Feng Xiao
84731a111f Down-integrate from internal branch. 2014-10-03 11:14:13 -07:00
Feng Xiao
725326f1ee Update verification methods' names. 2014-10-02 17:46:39 -07:00
Feng Xiao
0dd3fef843 Merge pull request #39 from xfxyjwf/fix24
Fix descriptor validation logic for packed enum fields.
2014-10-02 17:40:47 -07:00
Feng Xiao
eb223ed4f7 Merge pull request #3 from dhirschfeld/pyext-fix
Explicitly specify pyext/cpp_message.py in py_modules list
2014-10-02 15:55:32 -07:00
Feng Xiao
f5691a617e Fix descriptor validation logic for packed enum fields. 2014-10-01 18:26:48 -07:00
Feng Xiao
345d49a51e Fix a bug that causes DynamicMessage.setField() to not work for repeated
enum fields.
2014-10-01 17:31:28 -07:00
xfxyjwf
6147768171 Merge pull request #37 from google/fix_links
Replace links to code.google.com/protobuf with developers.google.com/protocol-buffers
2014-10-01 16:52:35 -07:00
Feng Xiao
e428862450 Replace links to code.google.com/protobuf with developers.google.com/protocol-buffers 2014-10-01 16:26:23 -07:00
xfxyjwf
a9155b8d3c Merge pull request #32 from worr/bug/solaris-atomicops
Add support for solaris atomicops
2014-09-23 10:48:02 -07:00