Jisi Liu
8b659b226a
Merge pull request #1783 from xfxyjwf/fixlite
...
Comment out lite conformance test.
8 years ago
Feng Xiao
047a3b4852
Exclude Java lite module from parent pom.xml
8 years ago
Feng Xiao
dd37b992be
Comment out lite conformance test.
...
The 'lite' generator flag is no longer supported.
8 years ago
Feng Xiao
06a02488ce
Add missing LIBPROTOBUF_EXPORT
8 years ago
Feng Xiao
7a7913e442
Add missing LIBPROTOBUF_EXPORT.
8 years ago
Feng Xiao
443eb27c7c
Update generated files.
8 years ago
Feng Xiao
9086d96439
Integrate from internal code base.
8 years ago
Thomas Van Lenten
70c1ac756d
Merge pull request #1776 from thomasvl/fix_dist
...
Remove the baseline files from the make dist file list.
8 years ago
Thomas Van Lenten
0d079bca76
Remove the baseline files from the make dist file list.
...
https://github.com/google/protobuf/pull/1762 remove the files, but I forgot to
update Makefile.am to remove them.
8 years ago
Jos Hickson
790e6afb72
Fixed out-of-date documentation for CodedInputStream.ReadEnum. ( #1581 )
9 years ago
Jon Skeet
3560cc9ede
Merge pull request #1702 from lukebakken/csharp-nuget-doc-update
...
Modify csharp README since there are now two NuGet packages
9 years ago
Jon Skeet
8779cba302
Merge pull request #1764 from jskeet/remove-is-value-type
...
Remove unnecessary reflection call
9 years ago
Jon Skeet
3df146e198
Remove unnecessary reflection call
...
This is the only call to TypeExtensions.IsValueType, so we can remove
that method, making the whole type conditionally compiled out for .NET 3.5
9 years ago
Thomas Van Lenten
c404c2a2e3
Merge pull request #1762 from thomasvl/drop_perf_profiles
...
Drop the performace baselines.
9 years ago
Thomas Van Lenten
8c23655519
Drop the performace baselines.
...
We weren't really using them, and the nested path causes checkout problems
on windows.
9 years ago
Thomas Van Lenten
8b00675fc8
Merge pull request #1757 from thomasvl/avoid_importing_src
...
Don't #import the .m files.
9 years ago
Jon Skeet
03d9e096d9
Merge pull request #1735 from jskeet/attribute-placement
...
Change placement of DebuggerNonUserCodeAttribute
9 years ago
Feng Xiao
c850ebcafa
Merge pull request #1758 from dago/pathmax2
...
Make sure also Solaris x86 gets PATH_MAX
9 years ago
Jon Skeet
e9a7fc837f
Remove WriteGeneratedTypeAttributes which is a no-op
...
This does not affect the generated code.
If we decide we want to apply attributes to generated types, we should start by
just reverting this change.
9 years ago
Dagobert Michelsen
57638d58e1
Make sure also Solaris x86 gets PATH_MAX
9 years ago
Jisi Liu
eaf3451cbb
Merge pull request #1753 from xfxyjwf/fixup
...
Fix problems detected when integrating the code to our internal repo.
9 years ago
Thomas Van Lenten
be0d7f6664
Don't #import the .m files.
...
As bazel folks are looking at getting auto generation of module maps going and
the importing of sources files causes issues there. We were only do it to
hack around some of the apple linker behaviors around objc classes and
categories, but even that isn't complete and CocoaPods was already doing -ObjC,
and developers not using pods could have still needed it to ensure everything
was linked anyways; so drop the hack of importing sources.
9 years ago
Feng Xiao
0d5091ee88
Merge pull request #1742 from ottok/fix-spelling
...
Fix spelling
9 years ago
Feng Xiao
d84d0ca13e
Fix data member declaration order.
9 years ago
Feng Xiao
a29a9c5d49
Don't support global ::string in stringpiece.h
9 years ago
Adam Cozzette
c10938a1d9
Merge pull request #1752 from acozzette/fix-js-tests
...
Fixed failing JS tests
9 years ago
Adam Cozzette
c64d86ed4f
Fixed failing JS tests
...
A couple of small tweaks were needed to fix test failures that were
inadvertently introduced in the last down integration. I also had to add
the map.js file which was missing.
9 years ago
Thomas Van Lenten
ec4589736e
Merge pull request #1712 from dkharrat/swift-error-handling
...
add nullable qualifier to return types that can be nil, to support Swift 2 try-catch syntax
9 years ago
Dia Kharrat
523bfd4f23
add nullable qualifier to nil return types
...
Add the `nullable` qualifier to return types of Objective-C methods that
can return a nil due to errors. This change makes these methods
compatible with the Swift 2 try-catch syntax.
9 years ago
Jon Skeet
c53484539c
Changes to generated code from previous commit
9 years ago
Jon Skeet
ada0a81a74
Move DebuggerNonUserCodeAttribute to function members
...
I think this has caught everything.
I've left a stub for attributes to be applied to the types themselves, but we don't currently need anything.
Follow-up commit will include the changes to generated code itself.
Fixes #1671 .
9 years ago
Otto Kekäläinen
d2ae496623
Fix spelling error in function ParseTime parameter
9 years ago
Otto Kekäläinen
3808d091f8
Fix spelling in strings and comments
9 years ago
Feng Xiao
cae3b0cbb6
Merge pull request #1704 from lizan/json_parse_options
...
Add JsonParseOptions to ignore unknown fields
9 years ago
Feng Xiao
02b55d248f
Merge pull request #1738 from xfxyjwf/fixbuild
...
Fix some failing travis tests.
9 years ago
Feng Xiao
e102db1f05
Fix some failing travis tests.
...
1. Add missing header file to Makefile.am.
2. Re-generate objectivec generated code for well-known types.
Change-Id: If28217c701cf8bd739ea0db240e9eee600f23ee7
9 years ago
Feng Xiao
aeff638a4c
Merge pull request #1710 from chezRong/master
...
Add minified Json printing functionality
9 years ago
Thomas Van Lenten
7e8c893003
Merge pull request #1723 from thomasvl/objc_test_coverage
...
Xcode project cleanup/setup.
9 years ago
chezRong
454dbf16fc
added minified JSON formatting functionality with test
9 years ago
Feng Xiao
2fe0556c7a
Fix windows build.
...
Change-Id: Ibf7d1df850f4b497303f9f617751be98327898ef
9 years ago
Adam Cozzette
69cc213c76
Updated failure_list_java.txt to remove tests that now pass
9 years ago
Adam Cozzette
b83af525db
Fixed string formatting in text_format.py to be Python2.6-compatible
...
In Python 2.6 the positional argument specifiers are apparently required
to be explicitly specified:
http://stackoverflow.com/questions/10054122/valueerror-zero-length-field-name-in-format-python
9 years ago
Adam Cozzette
d64a2d9941
Integrated internal changes from Google
...
This includes all internal changes from around May 20 to now.
9 years ago
Thomas Van Lenten
6cfc19edde
Xcode project cleanup/setup.
...
- Correct some cases sources were compiled into the static lib and the tests.
- Enable Xcodes code coverage support on the unittests. We aren't complete on
coverage, but having the data always there should make it easier to chip away
at this going forward.
- Drop method in tests that isn't used, wire up a validator in another test.
9 years ago
Thomas Van Lenten
c18aa7795a
Validate the tag numbers when parsing. ( #1725 )
...
There was a twist code path (that some times showed up due to what happened to
be in memory in failure cases), that would cast a bogus wire type into the
enum, and then fall through switch statements.
Resolve this by validating all wire types when parsing tags and throwing the
error at that point so it can't enter the system.
As added safety, stick in a few asserts for apis that get passed tags to ensure
they also are only seeing valid data.
Bonus: Tweak the parsing loop to skip some work when we get the end marker
(zero tag) instead of still looping through all the fields.
9 years ago
Thomas Van Lenten
e0016c5b6a
Merge pull request #1720 from thomasvl/issue_1716
...
Fix GPBGetMessage{Repeated,Map}Field()
9 years ago
Lizan Zhou
31999a3f95
Add JsonParseOptions to ignore unknown fields
...
- add JsonParseOptions for JsonToBinaryString allow unknown fields
- rename current JsonOptions to JsonPrintOptions
9 years ago
detlevschwabe
dc0aeaa903
Adding conditional compiler symbol to support .NET 3.5 ( #1713 )
...
* Adding condition compiler symbol to support .NET 3.5
9 years ago
Thomas Van Lenten
fc4c617199
Fix GPBGetMessage{Repeated,Map}Field()
...
- Correct impl by using helpers the message wiring does.
- Add unittests.
Fixes https://github.com/google/protobuf/issues/1716
9 years ago
Thomas Van Lenten
7b5648ca98
Merge pull request #1719 from esteluk/patch-1
...
Fix Objective-C generator option readme typo
9 years ago