aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/stubs
Commit message (Expand)AuthorAgeFilesLines
* add MethodResultCallback_0_0Camillo Lugaresi2016-12-211-0/+30
* Define LANG_CXX11 for port.h and use this to guard C++11 features.Chris Kennelly2016-12-141-0/+9
* Merge pull request #2495 from acozzette/android-hashAdam Cozzette2016-12-141-8/+3
|\
| * Removed Android-specific code from stubs/hash.hAdam Cozzette2016-12-131-8/+3
* | Merge pull request #2496 from xyzzyz/fix-overflowFeng Xiao2016-12-131-1/+1
|\ \
| * | Fix integer overflow in FastUInt32ToBufferLeftAdam Michalik2016-12-131-1/+1
| |/
* / Add support for Windows ARM buildsGergely Nagy2016-12-1216-94/+95
|/
* Send all protobuf logging to logcat by default on AndroidAdam Cozzette2016-12-071-2/+11
* Merge pull request #2437 from xfxyjwf/pluginFeng Xiao2016-12-061-0/+3
|\
| * Add version number to plugin protocol.Feng Xiao2016-12-051-0/+3
* | Merge pull request #2445 from ramrunner/masterFeng Xiao2016-12-051-1/+5
|\ \ | |/ |/|
| * when on OpenBSD we include the correct headers for endianess and check the ap...ramrunner2016-12-051-1/+5
* | Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-175-20/+20
|\ \
| * | Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the mac...Sergio Campama2016-11-072-4/+8
| * | Merge pull request #2301 from jbrianceau/arm-atomic-kuser-helpers-fix-v2Feng Xiao2016-11-031-0/+4
| |\ \
| | * | [arm/gcc] Don't rely on KUSER_HELPERS feature for atomicsJulien Brianceau2016-10-281-0/+4
| * | | generic atomicops: Use strong compare_exchangeJulien Brianceau2016-10-281-5/+5
| |/ /
| * / define no_threadlocal on OpenBSDramrunner2016-10-261-2/+2
| |/
| * Merge 3.1.x into master.Bo Yang2016-10-131-9/+1
| |\
| | * Fix MSVC build when HAVE_LONG_LONG is defined.Derek Murray2016-09-291-9/+1
| | * Fix VS test failures.Feng Xiao2016-09-231-0/+8
| | * Bump library veriosn to 3.1Bo Yang2016-09-211-5/+5
| | * Integrate internal changesBo Yang2016-09-193-1/+73
* | | Integrated internal changes from GoogleAdam Cozzette2016-11-172-32/+30
|/ /
* | Fix VS test failures.Feng Xiao2016-10-101-0/+8
* | Bump library veriosn to 3.1Bo Yang2016-10-101-5/+5
* | Integrate internal changesBo Yang2016-10-103-1/+73
* | Merge pull request #2192 from google/3.0.xJisi Liu2016-09-271-1/+1
|\ \
| * | Fix the version number for 3.0.2Jisi Liu2016-09-131-1/+1
* | | Fixes static analyzer issues from xcode.Sergio Campama2016-09-201-1/+3
| |/ |/|
* | Restore New*Callback into google::protobuf namespace since these are used by ...Srivats P2016-08-293-7/+4
* | Merge pull request #1044 from mark-whiting/masterFeng Xiao2016-08-041-0/+18
|\ \
| * | Adding missing generic gcc 64-bit atomicops.Mark Whiting2015-12-141-0/+18
* | | Merge pull request #1893 from google/3.0.0-GAJisi Liu2016-07-292-12/+14
|\ \ \ | | |/ | |/|
| * | Fixes traivs cpp build.Feng Xiao2016-07-262-5/+5
| * | Define intX as standard exact-width integer types.Feng Xiao2016-07-251-11/+13
* | | Be consistent with the use of CHECK()/ GOOGLE_CHECK().Clement Courbet2016-07-291-3/+4
|/ /
* | Merge pull request #1753 from xfxyjwf/fixupJisi Liu2016-07-071-8/+0
|\ \
| * | Don't support global ::string in stringpiece.hFeng Xiao2016-07-061-8/+0
* | | Fix spelling error in function ParseTime parameterOtto Kekäläinen2016-07-031-1/+1
* | | Fix spelling in strings and commentsOtto Kekäläinen2016-07-031-1/+1
|/ /
* | Integrated internal changes from GoogleAdam Cozzette2016-06-292-3/+12
* | Merge pull request #1542 from google/beta-3Jisi Liu2016-05-161-3/+55
|\ \
| * | Bridge vs2008 hashmaps.Jisi Liu2016-05-111-3/+55
* | | Remove confounding and unused #define - breaks boost/predef/other/endian.hWalter Gray2016-05-061-3/+1
|/ /
* | Merge pull request #1414 from xyzzyz/googletestFeng Xiao2016-04-201-1/+0
|\ \
| * | Remove googletest.h header from stringprintf.ccAdam Michalik2016-04-141-1/+0
* | | Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-011-1/+1
|\ \ \
| * | | Replace #include <iostream> with #include <ostream>Adam Michalik2016-03-301-1/+1
| |/ /
* | | Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-301-1/+1
|\| |