AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
1,065 Commits 35 Branches 138 Tags 124 MiB
5ff8dc8e00
Commit Graph

1065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Martin
5ff8dc8e00 Make ByteStrings serializable with java serialization. 2014-11-25 13:00:03 -05:00
Feng Xiao
99aa0f9e8f Down-integrate from internal code base. 2014-11-20 16:18:53 -08:00
Feng Xiao
49bc8c0963 Add nano proto authors and update LICENSE file to include Android.mk. 2014-11-20 14:27:46 -08:00
Feng Xiao
aa8ef98a1f Merge pull request #91 from xfxyjwf/android_nano 
Merge nano proto into protobuf repository.
 2014-11-20 14:22:55 -08:00
Feng Xiao
9e65d4bfb3 Fix the broken link at the bottom of javanano/README.txt 2014-11-20 14:21:43 -08:00
Feng Xiao
8a87fb8ecf Merge pull request #79 from xfxyjwf/license 
Update LICENSE to list files that aren't copyrighted by Google Inc.
 2014-11-20 14:17:29 -08:00
Feng Xiao
95c25918aa Merge nano proto into protobuf repository. 
Source: https://android.googlesource.com/platform/external/protobuf.git
 2014-11-19 17:14:29 -08:00
Feng Xiao
cd980d1c13 Prepare nano proto code to be merged into protobuf repository. 2014-11-19 15:58:54 -08:00
Feng Xiao
6a51460b98 Merge pull request #89 from tseaver/ignore-map_generated_files 
Ignore files generated from new 'map*.protobuf' sources.
 2014-11-18 15:43:23 -08:00
Tres Seaver
e9d18bca28 Ignore files generated from new 'map*.protobuf' sources. 2014-11-18 18:41:40 -05:00
Feng Xiao
db90dff872 Merge pull request #88 from tseaver/fix-class_key_must_be_declared_w_friend 
Fix compiler error: "a class-key must be used when declaring a friend"
 2014-11-18 15:02:09 -08:00
Tres Seaver
4113685cdd Fix testcase compile failure under gcc 4.6: 
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
.
 2014-11-18 11:58:21 -05:00
Tres Seaver
0fab06062f Fix 'error: a class-key must be used when declaring a friend' compile error. 2014-11-18 11:37:37 -05:00
Tres Seaver
0eb74768d0 Merge remote-tracking branch 'upstream/master' 2014-11-18 09:04:45 -05:00
Feng Xiao
e4f063f263 Merge pull request #86 from tseaver/compat_w_git_lt_1.8 
Make .gitignore more robust
 2014-11-17 18:17:10 -08:00
Feng Xiao
53c1029362 Merge pull request #84 from tseaver/fix_80-avoid_INT32_MAX_MIN 
Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.
 2014-11-17 18:15:40 -08:00
Tres Seaver
113eb61e6b Avoid '**/' patterns for compat w/ git < 1.8. 
Ignore generated test scaffolding files.

Exclude Python build artifacts.
 2014-11-17 20:05:42 -05:00
Tres Seaver
8b2aafe7d3 Use 'kint32min'/'kint32max' constants, rather than defining locally. 
Incorporates feedback from @xfxyjwf:
https://github.com/google/protobuf/pull/84#discussion_r20474781.
 2014-11-17 19:35:04 -05:00
Tres Seaver
38a3dd502d Exclude Python build artifacts. 2014-11-17 16:17:33 -05:00
Tres Seaver
83671c0514 Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'. 
Define safe constants to use when padding enums.

Fixes #80.
 2014-11-17 11:26:45 -05:00
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
f157a5651c Down-integrate from internal code base (C++ maps support). 2014-11-14 11:50:31 -08:00
Feng Xiao
9ae3b0b07c Update LICENSE to list files that aren't copyrighted by Google Inc. 
This is following what V8 does:
https://code.google.com/p/v8/source/browse/trunk/LICENSE
 2014-11-11 15:13:58 -08: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
Dan Albert
6dc3924536 Merge "Add platform versions of the protobuf libraries." 2014-11-11 19:28:23 +00:00
Dan Albert
68e7e78257 Add platform versions of the protobuf libraries. 
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
 2014-11-11 11:03:23 -08: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
Behrooz Khorashadi
e214da2663 am dbb9c303: Merge "Added an API method in FieldData to allow access to the UnknownField data" 
* commit 'dbb9c3033097e571e15c16d6e2e814be7e9d60bc':
  Added an API method in FieldData to allow access to the UnknownField data
 2014-11-06 19:21:54 +00:00
Behrooz Khorashadi
0b6a8f70fd Merge "Added an API method in FieldData to allow access to the UnknownField data" 2014-11-06 18:46:18 +00: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
Behrooz Khorashadi
5d6fc1921d Added an API method in FieldData to allow access to the UnknownField data 
Change-Id: I2cd5cfc80dce2a297fcd2511074b2a9d23d39837
 2014-11-05 11:15:07 -08: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
Jeff Davidson
e4e7f3a25d am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts." 
* commit '1ed1ec3609812a7818689cde01b6ce92d3f2315a':
  Move protobuf 2.3.0 to prebuilts.
 2014-10-29 12:32:26 +00:00
Jeff Davidson
59f2ff5856 Merge "Move protobuf 2.3.0 to prebuilts." 2014-10-28 18:14:12 +00:00
Feng Xiao
53d202f587 Add the missing solaris atomics header file. 2014-10-22 11:33:55 -07:00