Feng Xiao
c25d9feb4d
Down-integrate from internal code base.
10 years ago
Feng Xiao
90f2f50233
Make Java TextFormat.printToUnicodeString() escape newlines.
...
Fix issue #77
10 years ago
Feng Xiao
209840eca7
Merge pull request #106 from xfxyjwf/fix_62
...
Fix javadoc warnings.
10 years ago
Feng Xiao
418ece3bd1
Fix javadoc warnings.
10 years ago
Jisi Liu
7d2db50b21
Merge pull request #104 from pherl/master
...
Link Java Nano generator into protoc.
10 years ago
Jisi Liu
241921c666
Merge branch 'master' of github.com:google/protobuf
10 years ago
Jisi Liu
e9bbfbcd38
Link Java Nano generator into protoc.
10 years ago
Feng Xiao
6ae3bde73d
Fix issue 99.
10 years ago
Feng Xiao
7f3a25bebd
Merge pull request #103 from Ang3lus/master
...
Fix "anonymous types declared in an anonymous union are an extension" warning when using clang with -pedantic switch
10 years ago
Łukasz Twarduś
dd449e1c79
Fix "anonymous types declared in an anonymous union are an extension"
...
warning when using clang with -pedantic switch
10 years ago
Feng Xiao
99aa0f9e8f
Down-integrate from internal code base.
10 years ago
Feng Xiao
49bc8c0963
Add nano proto authors and update LICENSE file to include Android.mk.
10 years ago
Feng Xiao
aa8ef98a1f
Merge pull request #91 from xfxyjwf/android_nano
...
Merge nano proto into protobuf repository.
10 years ago
Feng Xiao
9e65d4bfb3
Fix the broken link at the bottom of javanano/README.txt
10 years ago
Feng Xiao
8a87fb8ecf
Merge pull request #79 from xfxyjwf/license
...
Update LICENSE to list files that aren't copyrighted by Google Inc.
10 years ago
Feng Xiao
95c25918aa
Merge nano proto into protobuf repository.
...
Source: https://android.googlesource.com/platform/external/protobuf.git
10 years ago
Feng Xiao
cd980d1c13
Prepare nano proto code to be merged into protobuf repository.
10 years ago
Feng Xiao
6a51460b98
Merge pull request #89 from tseaver/ignore-map_generated_files
...
Ignore files generated from new 'map*.protobuf' sources.
10 years ago
Tres Seaver
e9d18bca28
Ignore files generated from new 'map*.protobuf' sources.
10 years ago
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"
10 years ago
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
.
10 years ago
Tres Seaver
0fab06062f
Fix 'error: a class-key must be used when declaring a friend' compile error.
10 years ago
Tres Seaver
0eb74768d0
Merge remote-tracking branch 'upstream/master'
10 years ago
Feng Xiao
e4f063f263
Merge pull request #86 from tseaver/compat_w_git_lt_1.8
...
Make .gitignore more robust
10 years ago
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'.
10 years ago
Tres Seaver
113eb61e6b
Avoid '**/' patterns for compat w/ git < 1.8.
...
Ignore generated test scaffolding files.
Exclude Python build artifacts.
10 years ago
Tres Seaver
8b2aafe7d3
Use 'kint32min'/'kint32max' constants, rather than defining locally.
...
Incorporates feedback from @xfxyjwf :
https://github.com/google/protobuf/pull/84#discussion_r20474781 .
10 years ago
Tres Seaver
38a3dd502d
Exclude Python build artifacts.
10 years ago
Tres Seaver
83671c0514
Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.
...
Define safe constants to use when padding enums.
Fixes #80 .
10 years ago
Tres Seaver
706690bddb
Ignore generated test scaffolding files.
10 years ago
Tres Seaver
e8e3a5bf96
Compat w/ git < 1.8.
10 years ago
Feng Xiao
f157a5651c
Down-integrate from internal code base (C++ maps support).
10 years ago
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
10 years ago
Feng Xiao
faf581d208
Merge pull request #69 from apaprocki/aix-atomicops
...
Add AIX/POWER atomicops and fix compilation with IBM xlC C++ compiler.
10 years ago
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
10 years ago
Andrew Paprocki
1ddf6937ee
Added contributor and updated README to add AIX.
10 years ago
Andrew Paprocki
ebb41981c8
Add atomicops for AIX/POWER + IBM xlC compiler.
10 years ago
Dan Albert
6dc3924536
Merge "Add platform versions of the protobuf libraries."
10 years ago
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
10 years ago
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
10 years ago
Feng Xiao
6ef984af4b
Down-integrate from internal code base.
10 years ago
Veres Lajos
c76807211a
typo fixes - https://github.com/vlajos/misspell_fixer
10 years ago
Feng Xiao
baca1a8a1a
Adds more checks before deleting temporary files.
10 years ago
Feng Xiao
ad7f41bd57
Merge pull request #50 from dlitz/compat-py3k
...
setup.py fixes for Python 3
10 years ago
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
10 years ago
Behrooz Khorashadi
0b6a8f70fd
Merge "Added an API method in FieldData to allow access to the UnknownField data"
10 years ago
Feng Xiao
a270576f53
Merge pull request #71 from abyss7/master
...
Silence -Wsign-compare warning on Mac
10 years ago
Behrooz Khorashadi
5d6fc1921d
Added an API method in FieldData to allow access to the UnknownField data
...
Change-Id: I2cd5cfc80dce2a297fcd2511074b2a9d23d39837
10 years ago
Feng Xiao
3e0ec8de2b
Merge pull request #70 from AustinSchuh/master
...
Fixed Unused Parameter warning in headers.
10 years ago
Feng Xiao
11e6e9a3b0
Merge pull request #72 from Steelskin/master
...
Change references to `vector` to use `std::vector`
10 years ago