Commit Graph

6584 Commits

Author SHA1 Message Date
Yilun Chong
b4f193788c
Merge pull request #6115 from haon4/javalite_doc
Update instruction on how to use JavaLite runtime
2019-05-14 18:04:33 -07:00
Yilun Chong
1ded7fbb7d
Merge pull request #6138 from haoyuanli/patch-1
Fix typo 'pythong'
2019-05-14 17:52:15 -07:00
Joshua Haberman
d41002663f
Merge pull request #6139 from haberman/conformance-build
Typo fix for conformance test runner.
2019-05-14 17:05:45 -05:00
Joshua Haberman
7980ad8e1c
Merge pull request #6140 from protocolbuffers/revert-6128-convert-to-ruby
Revert "Convert Google::Protobuf.deep_copy to pure Ruby"
2019-05-14 17:04:54 -05:00
Joshua Haberman
d57581348d
Revert "Convert Google::Protobuf.deep_copy to pure Ruby" 2019-05-14 14:25:11 -07:00
Joshua Haberman
c659a4a4db Fixed typo: conformance_test_runner should be a binary, not library. 2019-05-14 14:01:16 -07:00
Joshua Haberman
0acd543dc4 Merge branch 'master' into conformance-build 2019-05-14 13:59:26 -07:00
Joshua Haberman
16d0021356
Merge pull request #6128 from tenderlove/convert-to-ruby
Convert Google::Protobuf.deep_copy to pure Ruby
2019-05-14 13:04:30 -05:00
haoyuanli
62246b9166
Fix typo 'pythong'
Changed 'pythong' to 'python'
2019-05-14 10:47:09 -07:00
Hao Nguyen
5f3f3d646d
Merge pull request #6133 from haon4/fix_update_pbh
Make sure to return the updated line when modifying .pb.h file
2019-05-13 19:36:42 -07:00
Hao Nguyen
3986786182 Make sure to return the updated line when modifying .pb.h file 2019-05-13 17:25:48 -07:00
Hao Nguyen
166652fc6f
Merge pull request #6127 from haon4/201905131051
Down integrate to GitHub
2019-05-13 17:00:12 -07:00
Aaron Patterson
3b67455319
Convert Google::Protobuf.deep_copy to pure Ruby
In general, I think it will help us to debug issues if we have less C
code and more Ruby code.  This method can be implemented in pure Ruby,
so this commit converts it to pure Ruby.
2019-05-13 15:37:13 -07:00
Hao Nguyen
3d1b5d7280 Move CreateUnknownEnumValues to anonymous namespace 2019-05-13 14:23:36 -07:00
Hao Nguyen
34af356256 Remove inline from generated_message_reflection 2019-05-13 13:09:49 -07:00
Hao Nguyen
a1c8868344 Down integrate to GitHub 2019-05-13 10:52:29 -07:00
Joshua Haberman
78ca77ac87
Added conformance tests to Bazel BUILD file (#6126) 2019-05-13 12:09:36 -05:00
Joshua Haberman
2996da4d81 Merge branch 'master' into conformance-build 2019-05-13 07:45:30 -07:00
Ruslan Manaev
982d5d2ab1 Fix compilation error with SDL check flag in Visual Studio 2019-05-10 14:14:33 -07:00
Seth Girvan
cdf873f29b Revert "protobuf.pc.in does not reflect CXXFLAGS"
This reverts commit a7180caf19.
2019-05-10 11:32:20 -07:00
Parnic
55f89a10fa Don't build io_win32 for Xbox One
This file contains a lot of code that doesn't compile for Xbox One and doesn't appear to be necessary for usage on that platform. _WIN32 is defined for the Xbox One platform.
2019-05-10 11:11:27 -07:00
Parnic
3691c172c9 Replaced unavailable include with struct definition for Xbox One
It appears this file was including winsock2.h just to get the timeval struct definition. There are platforms, such as Xbox One, that don't use winsock but do compile with _MSC_VER set, so just drop in the struct definition we needed instead of including all of winsock. This fixes compilation of this file for Xbox One. Without this change, there were numerous `timeval` complaints such as
```
1>c:\dev\protobuf\src\google\protobuf\util\time_util.h(153): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int (compiling source file C:\dev\protobuf\src\google\protobuf\util\time_util.cc)
1>c:\dev\protobuf\src\google\protobuf\util\time_util.h(153): error C2143: syntax error: missing ',' before '&' (compiling source file C:\dev\protobuf\src\google\protobuf\util\time_util.cc)
```
etc.
2019-05-10 11:11:27 -07:00
Per Lundberg
2bb7c278c2 Fix typo 2019-05-10 11:10:27 -07:00
Hao Nguyen
cf9fe7259b Update instruction on how to use JavaLite runtime 2019-05-08 17:05:58 -07:00
Hao Nguyen
ec1a70913e
Merge pull request #6106 from haon4/php_fix
Update php/release.sh to be executable and create a new branch
2019-05-06 13:55:16 -07:00
Hao Nguyen
a56b529832 Update php/release.sh to be executable and create a new branch for the new version 2019-05-06 12:58:01 -07:00
Hao Nguyen
b06fd483ae
Merge pull request #6097 from haon4/201905031433
Down integrate to GitHub
2019-05-03 17:03:32 -07:00
Hao Nguyen
4cebf97a52 Update BUILD file to match the changes in cmake files for lite 2019-05-03 15:08:01 -07:00
Hao Nguyen
1d4e959374 Down integrate to GitHub 2019-05-03 14:33:43 -07:00
Sydney Acksman
9e89b6e70a C# Proto2 feature : Extensions (#5350)
* Compiler changes (extensions)

* Generated changes (extensions)

* Library changes (extensions)

* Adjusted a summary to indicate ContainingType can be null for extensions

* Compiler changes (custom option review + access level review)

* Generated code changes (custom options + access review)

* Library changes (custom options + access review)

* Support C# 6 with library changes

* Access HasValue by property

* Set access level of all extension classes to internal (revert in next PR)

* Added null checks to custom options

* Rebase on master and regenerate Conformance

* Removed second dictionary from ExtensionSet

* Rebased compiler changes

* Rebased generated code changes

* Rebased library changes + review changes

* Add more safety checks to extension accessors

* Remove instances where extension sets were unnecessarily allocated

* Remove cleared items from sets
Empty sets are now made null
IExtensionMessage -> IExtendableMessage

* Remove dead code from IExtensionValue impls

* Clean both repeated and single value extensions

* Add GetOrRegister method for repeated fields and allow clearing repeated extensions

* Add type safe ClearExtension methods, remove non-generic IExtendableMessage interface.

* Simplify ExtensionSet.TryMergeFieldFrom

* Rebase on master to resolve conflicts

* Fix Makefile.am

* Add ObjectIntPair to Makefile.am
2019-05-03 13:54:41 -07:00
Denis Smirnov
3ee24bca49 should close protocolbuffers#6095 2019-05-03 13:21:09 -07:00
Parnic
fbe4ccccc5 Added missing include to satisfy certain versions of clang
Some compilers, such as PS4's clang, were giving errors such as:
C:\dev\protobuf\src\google/protobuf/parse_context.h(227,5): error : no type named 'uintptr_t' in namespace 'std'; did you mean simply 'uintptr_t'?
Adding the necessary include for integer types fixes these.
2019-05-02 17:18:22 -07:00
Maik Riechert
15cf5378b3 make use of RDTSC optional as it may not be available
One example is when using seccomp with PR_SET_TSC set to PR_TSC_SIGSEGV.
2019-05-02 10:52:38 -07:00
Hao Nguyen
c3721151ed
Merge pull request #6088 from haon4/201904301530
Down integrate to GitHub
2019-05-01 14:31:56 -07:00
Hao Nguyen
9276cb502e Fix gulpfile to use gulp 4 API 2019-05-01 13:22:07 -07:00
Hao Nguyen
983fd4e2ac Upgrade gulp version 2019-05-01 12:42:52 -07:00
Yilun Chong
f87aaff558
Merge pull request #6085 from haon4/update_version_fix
Change update_version to update the generated codes too
2019-05-01 11:36:00 -07:00
Hao Nguyen
76b4b4b331 Down integrate to GitHub 2019-04-30 15:30:49 -07:00
Hao Nguyen
5d4e58c4c2 Change update_version to update the generated codes too 2019-04-29 16:52:33 -07:00
Yilun Chong
859d2da51b
Merge pull request #6077 from haon4/fixlitepom
Remove unused files from lite's pom.xml
2019-04-26 17:42:23 -07:00
Hao Nguyen
598a6da287 Remove unused files from lite's pom.xml 2019-04-26 16:12:22 -07:00
Hao Nguyen
7f07bcdcfc
Merge pull request #6072 from haon4/revert_strcat
Partially Revert "Replaced all instances of Simple{IDF}toa with StrCat."
2019-04-25 14:41:36 -07:00
Hao Nguyen
ded3c23ead Only replace SimpleItoa with StrCat 2019-04-25 13:21:39 -07:00
Hao Nguyen
bbd6dc6d4e Revert "Replaced all instances of Simple{IDF}toa with StrCat."
This reverts commit 029f2c7cda.
2019-04-25 13:15:38 -07:00
Hao Nguyen
6b4b9869ec
Add a new conformance test for top level JSON null (#5966)
* Add a new conformance test for top level JSON null
2019-04-24 15:29:17 -07:00
Hao Nguyen
64a483aad1
Merge pull request #6044 from haberman/strcat
Replaced all instances of Simple{IDF}toa with StrCat.
2019-04-24 15:27:06 -07:00
Yilun Chong
cd63cc4914
Merge pull request #6069 from haon4/update_version
Update the version for JavaLite in update_version script
2019-04-24 14:37:58 -07:00
Hao Nguyen
13e188fb31 Update the version for JavaLite in update_version script 2019-04-23 17:06:40 -07:00
Hao Nguyen
d6bcf07a8f
Merge pull request #6064 from haon4/201904221711
Down integrate to GitHub
2019-04-23 09:54:53 -07:00
Hao Nguyen
711e4b4d6c Down integrate to GitHub 2019-04-22 17:12:12 -07:00