Max Cai
457861614f
am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
...
* commit 'ab8cc07120d0fbb6ea4982459bc4238f0eea61bd':
10 years ago
Max Cai
bfe3289a11
am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
...
* commit 'aa2afb0865fa9c15dcaf657d13c5144186548320':
10 years ago
Max Cai
5f851e79c3
am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
...
* commit '6ed6b682a2b93135e3f5cffc7e7627b879354c82':
10 years ago
Ulas Kirazci
e0dbffdeb6
am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
...
* commit 'f7bbfdfd53b1fbe0073eaa2b132d358edae2b545':
10 years ago
Ulas Kirazci
357f6b779f
am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
...
* commit 'ea95349d36ad1894fd68b23b04bc9a6422adeeb0':
10 years ago
Wink Saville
f5392a8efe
am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
...
* commit 'b624b3aa455ecf71c44bde4cf7488e7c199a0b8a':
10 years ago
Ulas Kirazci
e24507de07
am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
...
* commit 'a6ddccbbac403dbe6fce5623768755c08d41c962':
10 years ago
Ulas Kirazci
603d3f5a73
am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
...
* commit 'a8b4f97f34c7505fb1d1bc87ebe4c83f7032454c':
10 years ago
Ulas Kirazci
a96e4fd7b8
am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
...
* commit '6d1e97097eca8f50e629c10fcabbffbe064868b8':
10 years ago
Ulas Kirazci
f3e1090d18
am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
...
* commit '998ea484ba19563fd32ba3e2e16e785f449afa74':
10 years ago
Ulas Kirazci
9bb773f8c4
am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
...
* commit 'ede9a1f51eeff78ee4776858a17bda2d94e3edc5':
10 years ago
Adam Metcalf
87f4899a90
am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
...
* commit '67f3f6aa6d6b43d596ab5a572c6ae34fb60a8066':
10 years ago
Wink Saville
50b34232c9
am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
...
* commit 'f3bf05831fdad617a7841d7943a9f6f5797582a8':
10 years ago
Wink Saville
6e81fbbc16
am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
...
* commit '2fb1789c06fa82f73d136d83189ad1a54043348d':
10 years ago
Wink Saville
feac014e7d
am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
...
* commit '50ddd7addefb02ca23efd2f2c60442f91e276792':
10 years ago
Wink Saville
b5c235ccc2
am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
...
* commit '05f45faa5951f5ae0d05e0a4a9f5249339df31b4':
10 years ago
Wink Saville
e8e5707aee
am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
...
* commit '77140fb2a041eec2ef96cff59f8fa81c9355fcf3':
10 years ago
Ying Wang
c89112387e
am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
...
* commit '165d4d7e343099e4b84137b852a0a2070c27bba4':
10 years ago
jieluo@google.com
e61b513b1f
make dist complains the file name is too long and refuse to put it to tar. Change the file to a shorter name
10 years ago
jieluo@google.com
24095cc7e5
Add deleted tests back for reflection_cpp2_test.py by addtional exception catch
10 years ago
jieluo@google.com
5dd5f0d09a
change python README.txt
10 years ago
jieluo@google.com
2d10b80f45
change Makefile.am
10 years ago
jieluo@google.com
b70e586603
put python cpp tests into pyext/
10 years ago
jieluo@google.com
7580a8929f
add shared_pr.h
10 years ago
jieluo@google.com
bde4a3254a
down integrate python opensource to svn
10 years ago
jieluo@google.com
d7339318a3
Change java descriptor back to private
10 years ago
jieluo@google.com
83964a9ab4
1, Add comments for include<algorithm> we added for min/max on VS2013. 2, Add #if/#endif to wrap #undef
10 years ago
jieluo@google.com
7db9c098df
change java compiler to only produce one java file
10 years ago
Max Cai
4be139dcd8
am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"
...
* commit 'a76831c3629c3c1a9900984f3aea6306dbf0734c':
Fix how getRepeatedFieldArrayLength works
10 years ago
jieluo@google.com
9efebb3294
use #undef instead of change the name of MemoryBarrier
10 years ago
jieluo@google.com
8d6f04ad8d
Cygwin doesn't work well if we try to capture stderr and stdout at the same time. Comment one test tempraly for Cygwin. Need to figure out why and add the test back for Cygwin.
10 years ago
jieluo@google.com
ce58c88019
Remove AM_PROG_AR.
...
With AM_PROG_AR may report "error: possibly underfined macro: AM_PROG_AR" (mingw, autoreconf-2.68).
Without AM_PROG_AR may report warning "archiver requires 'AM_PROG_AR' in 'configure.ac'" (cygwin, automake-1.12).
They do not affect the tests and install
10 years ago
jieluo@google.com
abe61de6e6
make changes to pass Cygwin
10 years ago
Sam Hasinoff
33824b0f1b
am f91b7fa1: Fix build, by using external/zlib instead of system zlib
...
* commit 'f91b7fa173d2aa76ce593c20e429bd8d480599ea':
Fix build, by using external/zlib instead of system zlib
10 years ago
Sam Hasinoff
333c46cd1d
Fix build, by using external/zlib instead of system zlib
...
Change-Id: I22f72f7c21f0c3f7b40deeca429af39453dfdc51
10 years ago
Max Cai
ec0e1c00e0
Merge "Fix how getRepeatedFieldArrayLength works"
10 years ago
jieluo@google.com
91e32ac64d
add #ifdef _MSC_VER
10 years ago
Leandro Gracia Gil
985cc6a74e
am 4d11e705: Merge "Fix the aprotoc target for Windows."
...
* commit '4d11e705cb073e55283452e6fd50e3feff54f82c':
Fix the aprotoc target for Windows.
10 years ago
jieluo@google.com
81d833d07d
add one file for VC 2013
10 years ago
jieluo@google.com
7ee0f3edc7
change some files to pass MSVC 2013
10 years ago
jieluo@google.com
b7aebe4099
Change MemoryBarrier() to MemoryBarrierInternal(). Resolve name conflict in mingw gcc 4.8.1
11 years ago
Leandro Gracia Gil
a174231837
Merge "Fix the aprotoc target for Windows."
11 years ago
Leandro Gracia Gil
b596f9c7b4
Fix the aprotoc target for Windows.
...
Allows aprotoc.exe to be cross-compiled when building the Windows SDK.
Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c
11 years ago
jieluo@google.com
db9f7dd1ac
1, Remove unkown field support in jave TextFormat
...
2, Verifies the EnumValueDscriptor for DynamicMessage.Builder#setField
11 years ago
jieluo@google.com
9eda53a6f1
Increase the allocated_size_ should be after allocation. Otherwise there might have segmentation fault if allocation throws an exception.
11 years ago
jieluo@google.com
e6726e2150
use decimal constants to avoid casting error with visual c /W4
...
"unary minus operator applied to unsigned type, result still unsigned"
11 years ago
Brian Duff
c390fe3eb3
am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName."
...
* commit '95d99df4574c28debcf9646056a0350ff44bc7c9':
Don't return NULL from {Boxed}PrimitiveTypeName.
11 years ago
Brian Duff
23c5978a76
Merge "Don't return NULL from {Boxed}PrimitiveTypeName."
11 years ago
Brian Duff
7acc0f831f
Don't return NULL from {Boxed}PrimitiveTypeName.
...
The behavior of the string ctor is undefined when you pass NULL. This
is checked strictly in C++11, so fails to compile.
Change-Id: Id5e0984ad1d37f2d504f7c42ac23e52ed4a58903
11 years ago
jieluo@google.com
76b8a769ab
add LazyFieldLite.java
11 years ago