aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #770 from pkasting/string_spaceFeng Xiao2015-08-284-19/+14
|\
| * Move StringSpaceUsedIncludingSelf to lite library.Peter Kasting2015-08-274-19/+14
* | Merge pull request #771 from pkasting/static_init_1Feng Xiao2015-08-282-63/+78
|\ \
| * | Remove a static initializer by removing a global of non-POD type.Peter Kasting2015-08-272-63/+78
* | | Merge pull request #569 from redivo/masterFeng Xiao2015-08-281-5/+5
|\ \ \
| * | | Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax errorGeorge Redivo2015-07-061-5/+5
* | | | Merge pull request #768 from pkasting/timeFeng Xiao2015-08-281-1/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Delete kNanosPerSecond from time.cc.Peter Kasting2015-08-271-1/+0
| | |/ | |/|
* | | Merge pull request #746 from zmodem/fix_predict_macros2Feng Xiao2015-08-271-2/+2
|\ \ \
| * | | Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}Hans Wennborg2015-08-261-2/+2
* | | | Avoid #including system headers from inside a namespace.Peter Kasting2015-08-271-6/+10
| |/ / |/| |
* | | Merge pull request #709 from xfxyjwf/map_bugFeng Xiao2015-08-262-1/+14
|\ \ \ | |/ / |/| |
| * | Fix map fields parsing.Feng Xiao2015-08-112-1/+14
* | | Merge pull request #726 from DouglasHeriot/msvc-noinlineFeng Xiao2015-08-256-23/+31
|\ \ \
| * | | Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release buil...Douglas Heriot2015-08-226-23/+31
* | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Jon Skeet2015-08-252-6/+7
* | | | Remove Python 2.5 cruftTamir Duberstein2015-08-221-14/+6
|/ / /
* | | Merge pull request #720 from jtattermusch/csharp_fixesJon Skeet2015-08-141-1/+1
|\ \ \
| * | | fix type initialization problem with FileDescriptorJan Tattermusch2015-08-141-1/+1
* | | | Merge pull request #571 from thomasvl/validation_supportPaul Yang2015-08-145-90/+287
|\ \ \ \ | |/ / / |/| | |
| * | | Add support for a file listing expected package to objc prefixes for validation.Thomas Van Lenten2015-08-145-90/+287
| |/ /
* / / Allow public access to descriptor.proto as a dependency.Jon Skeet2015-08-132-2/+12
|/ /
* | Merge pull request #700 from jskeet/remove-packed-hackJan Tattermusch2015-08-082-12/+1
|\ \
| * | Remove our own version of MakeTag now that the main one is fixed.Jon Skeet2015-08-072-12/+1
* | | Merge pull request #694 from jskeet/groupsJon Skeet2015-08-081-4/+1
|\ \ \ | |/ / |/| |
| * | Skip groups properly.Jon Skeet2015-08-061-4/+1
* | | Merge pull request #645 from zsurocking/masterPaul Yang2015-08-0615-81/+202
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master'Xiao Hang2015-08-0488-2378/+2035
| |\ \ \
| * | | | Generate a package name suffix ".nano" for nano messagesXiao Hang2015-07-295-58/+174
* | | | | Remove unused .pb.h #includes.Bo Yang2015-08-064-4/+0
| |_|/ / |/| | |
* | | | Change ReadTag and PeekTag to just use 0 as a return value for "end of stream...Jon Skeet2015-08-051-3/+1
* | | | Consume unknown fields when parsing.Jon Skeet2015-08-051-1/+2
| |/ / |/| |
* | | Merge pull request #653 from airtimemedia/masterFeng Xiao2015-08-036-13/+7
|\ \ \
| * | | Move pthread include.Tom Hughes2015-07-302-2/+4
| * | | Remove unused private fields.Tom Hughes2015-07-294-12/+2
| * | | Fix compilation error when using C++11.Tom Hughes2015-07-291-1/+1
| * | | Include pthread.h when using GOOGLE_PROTOBUF_NO_THREADLOCAL.Tom Hughes2015-07-281-0/+2
| |/ /
* | | Merge pull request #643 from yukawa/fix_win_unicode_buildPaul Yang2015-07-311-1/+1
|\ \ \
| * | | Fix build failure on Windows when Unicode build is enabled.Yohei Yukawa2015-07-301-1/+1
* | | | Handle field names of "descriptor" and "types".Jon Skeet2015-07-311-1/+7
* | | | refactor umbrella class helpersJan Tattermusch2015-07-306-34/+28
* | | | Merge pull request #632 from google/csharp-experimentalJan Tattermusch2015-07-3074-2307/+1966
|\ \ \ \
| * | | | Prohibit null values for string/bytes fields in generated code.Jon Skeet2015-07-302-13/+2
| * | | | More freezing tidy-up; generated code in next commit.Jon Skeet2015-07-301-3/+1
| * | | | remove the freeze APIJan Tattermusch2015-07-298-46/+2
| * | | | Fix attribute mistake and regenerate code.Jon Skeet2015-07-221-2/+0
| * | | | Remove the usage of attributes for field/method discovery.Jon Skeet2015-07-2212-50/+96
| * | | | Revamp to reflection.Jon Skeet2015-07-2113-99/+45
| * | | | Merge pull request #629 from google/masterJon Skeet2015-07-2115-1420/+1697
| |\| | |
| * | | | Merge pull request #611 from jskeet/csharp-wrappersJon Skeet2015-07-1710-35/+466
| |\ \ \ \