aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* fix compiler warnings.Jisi Liu2015-06-243-11/+6
* Merge pull request #503 from thomasvl/add_nonnill_markupPaul Yang2015-06-192-9/+13
|\
| * Add nonnil markup to ObjC library.Thomas Van Lenten2015-06-162-9/+13
* | using ::isnan to avoid conflicts with std::isnan for C++11 build.Jisi Liu2015-06-181-1/+1
* | Merge pull request #501 from xfxyjwf/downFeng Xiao2015-06-1792-154/+28178
|\ \
| * | Fix broken builds.Feng Xiao2015-06-1726-128/+170
| * | Down-integrate from internal code base.Feng Xiao2015-06-1592-150/+28132
| |/
* / Make the code independent of config.hJisi Liu2015-06-167-14/+10
|/
* Merge pull request #488 from AustinSchuh/ruby_test_fixFeng Xiao2015-06-151-0/+4
|\
| * Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUFAustin Schuh2015-06-101-0/+4
* | Merge pull request #495 from pherl/masterJisi Liu2015-06-132-18/+145
|\ \
| * | Make pbconfig.h independent of config.hJisi Liu2015-06-132-18/+145
| |/
* | Merge pull request #481 from Qartar/masterFeng Xiao2015-06-123-15/+61
|\ \
| * | Workaround for MSVC's string literal compiler limit.Qartar2015-06-123-15/+61
* | | Give descriptor.proto a go packageTamir Duberstein2015-06-122-3/+5
| |/ |/|
* | Merge pull request #480 from thomasvl/objc_beta_dropPaul Yang2015-06-0914-554/+355
|\ \
| * | Beta quality drop of Objective C Support.Thomas Van Lenten2015-06-0814-554/+355
| |/
* / Refactored threadlocal logic.Austin Schuh2015-06-085-9/+15
|/
* Merge pull request #468 from AustinSchuh/unsigned_protoFeng Xiao2015-06-063-19/+19
|\
| * Marked another compiler literal unsigned.Austin Schuh2015-06-053-19/+19
* | Fixed bug in GOOGLE_PREDICT_FALSE.Austin Schuh2015-06-051-1/+1
|/
* Merge pull request #462 from anandolee/masterJie Luo2015-06-0425-1632/+1846
|\
| * Migrate writer to io::Printer for C#Jie Luo2015-06-0425-1632/+1846
* | Merge pull request #457 from xfxyjwf/cmakeFeng Xiao2015-06-041-11/+8
|\ \
| * | Add cmake support.Feng Xiao2015-05-311-11/+8
* | | Merge pull request #453 from bakineggs/masterFeng Xiao2015-06-031-0/+14
|\ \ \
| * | | Add protoc path detection for Mac OSDan Barry2015-06-021-0/+14
* | | | Merge pull request #444 from xfxyjwf/vs2010_fixFeng Xiao2015-06-022-9/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Call copy() only if there is something to copy.Feng Xiao2015-05-311-1/+3
| * | Fix MapAllocator::destroy() bug.Feng Xiao2015-05-311-8/+6
* | | Merge pull request #305 from ezegomez/masterFeng Xiao2015-06-021-1/+1
|\ \ \
| * | | Fix unittest in i386Ezequiel Lara Gomez2015-04-271-1/+1
* | | | Merge pull request #441 from anandolee/masterJan Tattermusch2015-06-012-168/+23
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Change the C# enum generator inherit from primitive generatorJie Luo2015-05-292-168/+23
* | | Merge pull request #404 from anandolee/masterJie Luo2015-05-2910-53/+463
|\| |
| * | Add oneof support for C#Jie Luo2015-05-2910-53/+463
* | | Fixes on visual studio 2008unknown2015-05-277-11/+14
* | | Replace "\\" with "/" for windows path names.Feng Xiao2015-05-261-0/+4
* | | In std11, on mac, operator new doesn't take right reference.TeBoring2015-05-261-1/+1
* | | Merge pull request #430 from xfxyjwf/std11_fixPaul Yang2015-05-261-0/+12
|\ \ \
| * | | Make MapAllocator work with C++11.Feng Xiao2015-05-261-0/+12
* | | | Merge pull request #429 from xfxyjwf/std11_fixPaul Yang2015-05-261-6/+0
|\| | |
| * | | Remove std::is_trivially_default_constructible.Feng Xiao2015-05-261-6/+0
* | | | When doing make distcheck, a src/google/protobuf/compiler/ruby is created toBo Yang2015-05-261-3/+3
|/ / /
* | | uint64 has non-trivial destructor on 32-bit windows. This cause arenaBo Yang2015-05-261-5/+5
* | | Adds objectivec_helpers.h to the headers installed by make.Jorge Canizales2015-05-261-0/+1
* | | Explicitly call destructor of Mutex to release resources.Feng Xiao2015-05-251-1/+5
* | | Make hash_map forward constructor parameters to its base class.Feng Xiao2015-05-251-6/+17
* | | Copy two data files from ruby/tests to src/google/compiler/ruby. Tests in src...Bo Yang2015-05-254-7/+150
* | | Fix bugs on windows.Bo Yang2015-05-2411-41/+64