1145 Commits (4c92289766d76f276b322ab254ef039f670f41b1)
 

Author SHA1 Message Date
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 10 years ago
Leandro Gracia Gil a174231837 Merge "Fix the aprotoc target for Windows." 10 years ago
Leandro Gracia Gil b596f9c7b4 Fix the aprotoc target for Windows. 11 years ago
jieluo@google.com db9f7dd1ac 1, Remove unkown field support in jave TextFormat 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 11 years ago
Brian Duff c390fe3eb3 am 95d99df4: Merge "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. 11 years ago
jieluo@google.com 76b8a769ab add LazyFieldLite.java 11 years ago
jieluo@google.com 3b547d3526 Add iostream in message.cc. Remove unused in coded_stream_unittest.cc 11 years ago
jieluo@google.com a35f979c17 delete unused variable 11 years ago
jieluo@google.com 01283faa47 add printUnicode methods in TextFormat 11 years ago
Max Cai a481ed8269 am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano." 11 years ago
jieluo@google.com 4de8f55113 down integrate to svn 11 years ago
Max Cai 2a5f3f97a0 Merge "Add a hasExtension method to ExtendableMessageNano." 11 years ago
Juan Silveira c052b50388 Add a hasExtension method to ExtendableMessageNano. 11 years ago
Max Cai 2e91cf4f68 am a88808d4: Merge "Fix access around unknownFieldData." 11 years ago
Max Cai 9c2d63c8d3 am daf63839: Merge "Keep pointers to extension values." 11 years ago
Max Cai 30b1454d8b Merge "Keep pointers to extension values." 11 years ago
Max Cai 7a83d3482a Merge "Fix access around unknownFieldData." 11 years ago
Max Cai d1a8a8f6f1 Fix access around unknownFieldData. 11 years ago
Juan Silveira 79f19eb9f1 Keep pointers to extension values. 11 years ago
Max Cai 9ceb3d4acc Fix how getRepeatedFieldArrayLength works 11 years ago
liujisi@google.com c5553a3d18 Down-integrate pending changes from internal repository after previous release. 11 years ago
Ying Wang 30cd2a4a98 am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 11 years ago
Baligh Uddin c7213e1c39 am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 11 years ago
Ying Wang b18d5c1d43 am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 11 years ago
Baligh Uddin f5759da88c am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 11 years ago
Ying Wang 82461de508 You CANNOT change the global WITH_DEXPREOPT 11 years ago
Baligh Uddin 709cb7348e keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 11 years ago
Qiwen Zhao 1d50c6b47c reset with history at sha1 d5219df3ce036d4f43262bbda1016097a59a0c81 11 years ago
Wink Saville 9db6d437df am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 11 years ago
Wink Saville 3b0952fb80 Revert "Merge commit 'e887563a' into fix-merge-conclict" 11 years ago
Wink Saville d9b892d45b Merge "Revert "Merge commit 'e887563a' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 11 years ago
Wink Saville fadc11055e Revert "Merge commit 'e887563a' into fix-merge-conclict" 11 years ago
Jan-Willem Maarse 9a58c6f56c am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" 11 years ago
Bill Yi ef5fd0e053 am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD 11 years ago
Jeff Davidson be8aadfd3b am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master 11 years ago
Max Cai 8b6445a019 am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" 11 years ago
Max Cai 8624f47bab am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 11 years ago
Wink Saville b67c3fa484 am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" 11 years ago
Wink Saville 642f7003a7 Merge commit 'f65ee555' into fix-merge-conflict 11 years ago
Jan-Willem Maarse 9ad944e2d6 am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" 11 years ago
Bill Yi e76c2cefee am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD 11 years ago
Jeff Davidson a3d1a03fc1 am 8113c186: resolved conflicts for merge of 592b6078 to master 11 years ago
Max Cai ba0ea9552f am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" 11 years ago
Max Cai 78e5e83012 am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 11 years ago
Wink Saville b05e2ffe0c am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" 11 years ago