Commit Graph

3233 Commits

Author SHA1 Message Date
Jon Skeet
5dba7d7b4c Introduce ICustomDiagnosticMessage to allow for custom string formatting
This fixes issue #933, effectively.
2016-01-13 10:58:49 +00:00
Jan Tattermusch
73c003c309 Merge pull request #1089 from jskeet/map-null
Prohibit null values in maps
2016-01-12 20:55:47 -08:00
Joshua Haberman
937ef23acd Merge pull request #1080 from haberman/conformance-crashes
Allow conformance test runner to tolerate crashes, and re-enable conformance tests
2016-01-12 15:30:35 -08:00
Feng Xiao
da2eb68dd3 Merge pull request #1129 from dongjoon-hyun/fix_typos_in_README_and_CHANGES
Fix typos in README.md/CHANGES.txt
2016-01-12 10:54:44 -08:00
Josh Haberman
7e74a02b17 Don't generate Objective C WKT for conformance tests to avoid dupliate defs. 2016-01-12 08:56:17 -08:00
Thomas Van Lenten
af8e7ef9a3 Merge pull request #1131 from thomasvl/fix_sem_leak
Release the semaphore in dealloc, fixing leak.
2016-01-12 09:05:50 -05:00
Thomas Van Lenten
4d663376e2 Release the semaphore in dealloc, fixing leak. 2016-01-12 09:04:08 -05:00
Josh Haberman
043ca2b84b Conformance: Update C# failure list to reflect which tests currently pass. 2016-01-12 02:48:00 -08:00
Josh Haberman
fc7f8d9cd0 Fixed Ruby conformance tests by running them under rvm Ruby. 2016-01-11 21:16:42 -08:00
Josh Haberman
bf50ec4ac9 Added debugging output to debug type= problem on Travis. 2016-01-11 16:15:46 -08:00
Josh Haberman
ea909a57e4 Updated C#'s failure list, and added missing file. 2016-01-11 16:15:46 -08:00
Josh Haberman
e891c29f9b Allow conformance test runner to tolerate crashes, and re-enable conformance tests. 2016-01-11 16:15:46 -08:00
Dongjoon Hyun
7b08d49e9d Fix typos in README.md/CHANGES.txt 2016-01-11 14:52:01 -08:00
Feng Xiao
c64146f195 Merge pull request #1046 from peternewman/patch-1
Add the docs claimed define for HAVE_UNORDERED_MAP
2016-01-11 11:16:35 -08:00
Jon Skeet
9e4f354f14 Prohibit null values in map fields
On deserialization, missing values for message types
are replaced with a "default" message.
2016-01-11 09:34:43 +00:00
Peter Newman
4af1cc7445 Revert the change and remove an incorrect comment 2016-01-09 13:38:42 +00:00
Feng Xiao
5700a1054b Merge pull request #1124 from xfxyjwf/appveyor
Fix appveyor build.
2016-01-09 01:04:07 -08:00
Feng Xiao
8f2b622944 Fix appveyor build. 2016-01-09 00:48:49 -08:00
Jan Tattermusch
6d1d415133 Merge pull request #1098 from jskeet/wkt-json
Ensure all formatted well-known-type values are valid JSON
2016-01-08 16:58:47 -08:00
Jan Tattermusch
698f61688c Merge pull request #1088 from jskeet/codec-pruning
Remove unused method in FieldCodec.
2016-01-08 16:50:05 -08:00
Jan Tattermusch
be44985c8c Merge pull request #1087 from jskeet/json-tests
Improve number handling in JSON parsing
2016-01-08 16:49:22 -08:00
Feng Xiao
edd60c9003 Merge pull request #1120 from gitplaneta/master
Update README.md - remove typo
2016-01-08 14:22:28 -08:00
Radoslaw Busz
7d91667e82 Update README.md - remove typo 2016-01-08 15:18:48 +00:00
Feng Xiao
35683bc179 Merge pull request #1101 from xfxyjwf/doc
Update README.md and remove INSTALL.txt
2016-01-07 11:03:33 -08:00
Thomas Van Lenten
d134a80f84 Merge pull request #1118 from thomasvl/xcode_scheme_cleanup
Remove the stale reference to test no longer around, and keep the performance test limited to just performance tests.
2016-01-07 10:35:38 -05:00
Thomas Van Lenten
0e42ed30cb Remove the stale reference to test no longer around, and keep the performance test limited to just performance tests. 2016-01-07 10:31:33 -05:00
Feng Xiao
64d865210f Update README.md and remove INSTALL.txt
Added instructions on what tools to install to compile protobuf from
source. Removed the INSTALL.txt file because it's just a simple copy of
the autoconf documentation and confuses users.

Change-Id: I6fd8aa13495f1238fe5c62451b95ad480b1c4bed
2016-01-06 18:25:25 -08:00
Feng Xiao
76195058e2 Patch internal change 111557819.
Defer calls to mutable_unknown_fields() until it is actually required to
save memory for C++ lite runtime.

Change-Id: Ica9c1fd276cdb164942d1e7b6e098c83ee3ffdc5
2016-01-06 18:10:24 -08:00
Feng Xiao
363316a8d7 Merge pull request #1100 from xfxyjwf/javadoc
Update version number and fix javadoc errors.
2016-01-06 16:41:01 -08:00
Feng Xiao
7d075a44c1 Update version number and fix javadoc errors. 2016-01-06 15:47:41 -08:00
Thomas Van Lenten
ee4a0c0e06 Merge pull request #1094 from thomasvl/update_objc_conformance
Fix up the conformance tests
2016-01-06 14:16:25 -05:00
Jon Skeet
b4a58173f2 Ensure all formatted well-known-type values are valid JSON
This involves quoting timestamp/duration/field-mask values, even when they're not in fields.
It's better for consistency.

Fixes issue #1097.
2016-01-06 12:05:31 +00:00
Jon Skeet
aa431a0481 Improve number handling in JSON parsing
- Tighten up on Infinity/NaN handling in terms of whitespace handling (and test casing)
- Validate that values are genuinely integers when they've been parsed from a JSON number (ignoring the fact that 1.0000000000000000001 == 1 as a double...)
- Allow exponents and decimal points in string representations
2016-01-06 11:16:10 +00:00
Thomas Van Lenten
df4e4d8717 Fix up the conformance tests
- Update all the new runner cases to handle a skip result as a skip and not a failure.
- Make ObjC use the new serialize_error result if it fails to generate the data.
2016-01-05 16:31:40 -05:00
Thomas Van Lenten
d19c26f2c8 Merge pull request #1093 from thomasvl/fix_objc
Update objectivec/google/protobuf/Type.pbobjc.m
2016-01-05 15:27:39 -05:00
Thomas Van Lenten
fcce7842fc Update objectivec/google/protobuf/Type.pbobjc.m
commit e841bac4fc seems to have updated the
generated .pbobjc.h but not the .pbobjc.m to match.
2016-01-05 15:23:50 -05:00
Thomas Van Lenten
de99998218 Merge pull request #1092 from thomasvl/fix_conformance
Fix conformance test to only report skips in verbose mode.
2016-01-05 15:03:31 -05:00
Thomas Van Lenten
de3c56a0d1 Fix conformance test to only report skips in verbose mode.
commit e841bac4fc seems to have mis-merged the
change to reporting skipped tests.

I didn't check if there were other merge issues.
2016-01-05 15:00:51 -05:00
Thomas Van Lenten
d7183b0abd Merge pull request #1091 from thomasvl/objc_tests_use_autocreators
Have the tests rely on the autocreator behaviors.
2016-01-05 14:50:34 -05:00
Thomas Van Lenten
ca428c1bc9 Have the tests rely on the autocreator behaviors.
Incase developers look at the tests for examples, have them rely on the
autocreators also.
2016-01-05 14:25:17 -05:00
Jon Skeet
9f10c4576a Remove unused method in FieldCodec.
(The method was last used a very long time ago, if ever.)
2016-01-05 14:36:14 +00:00
Jon Skeet
2f15b8f50c Merge pull request #1085 from jskeet/fix-generation
Fix C# source generation shell script and remove out of date notes
2016-01-05 07:04:18 +00:00
Jon Skeet
d49b9c81ec Fix C# source generation shell script and remove out of date notes
The conformance tests now use types which are part of src/google/protobuf, so we need to include src in the proto path.
The notes around "fix-ups" have been out of date for some time now.
2016-01-04 14:02:00 +00:00
Joshua Haberman
77831c076d Merge pull request #1081 from haberman/fix-py3
Fixes for Python 3.
2015-12-31 12:04:36 -08:00
Josh Haberman
e1abdf2c76 Fixed compile for Python 3. There are still some crashes though. 2015-12-30 16:09:53 -08:00
Feng Xiao
d5fb408ddc Add changelog for v3.0.0-beta-2.
[skip ci]

Change-Id: Id383944dd3c999ad1008345ef34c9bdae24abc7c
2015-12-30 13:21:46 -08:00
Feng Xiao
17347e3d0d Fix for Visual Studio 2008. 2015-12-30 01:18:22 -08:00
Feng Xiao
283c40c897 Require six>=1.9 for Python.
We use six sub-modules that aren't available in old versions. Not specifying
this requirement in the setup will lead to much less readable runtime errors.
It's particuarlly problematic for Mac OSX users because the system comes with
an old six version 1.4.1 by default.

[skip ci]
2015-12-29 14:36:46 -08:00
Feng Xiao
ef6c72b46b Update BUILD/cmake files.
Change-Id: I6fa9f1b65d6c06b891aabf3f3d868364d74d727d
2015-12-28 17:33:55 -08:00
Feng Xiao
c5147e3d51 Fix a misplaced macro.
Change-Id: Ife609e073bd142d328b680c753f543bb18f4f66d
2015-12-28 16:40:39 -08:00