Commit Graph

3354 Commits

Author SHA1 Message Date
Josh Haberman
2cd79bf3a8 Removed duplicated operator delete from merge conflict. 2016-04-07 14:26:59 -07:00
Josh Haberman
4465daa57a Merge branch 'master' into internal-merge 2016-04-07 14:10:19 -07:00
Josh Haberman
15239361e3 Fix for CommonJS tests. 2016-04-07 14:04:55 -07:00
Jie Luo
09292d5759 Merge pull request #1392 from anandolee/master
Sync the manually integrate changes in google3/third_party
2016-04-07 11:05:05 -07:00
Jon Skeet
cef46e115a Merge pull request #1390 from jskeet/tidy-up
Tidy up for C# codegen
2016-04-07 08:49:27 +01:00
Jie Luo
c61207492e sync the Manually integrate changes in google3/third_party 2016-04-06 14:32:30 -07:00
Thomas Van Lenten
28c5c25397 Merge pull request #1391 from thomasvl/string_tweaks
ObjC String followups: one test case only addition, behavior change for invalid UTF-8
2016-04-06 15:52:17 -04:00
Geoffrey Wiseman
f98d2f5147 Updating Xcode Settings to use iOS 9.3
Update the simulators used for some tests under Xcode 7.3 to be iOS 9.3.
2016-04-06 15:29:52 -04:00
Jon Skeet
2a18bb5a33 Add more documentation for csharp_options.h
This also renames generate_directories to base_namespace_specified; generating directories is the
immediate *effect* of specifying a base namespace, but with this change the options reflect what has been
specified rather than the effect. (There may be other effects in the future, of course.)
2016-04-06 10:30:19 +01:00
Jon Skeet
bfd1c84a3d Line-wrapping changes only for C# generator code
This should have no behavioral changes at all.

This doesn't strictly enforce an 80-column limit, but removes the most egregious violations.
The indentation in the C# generator code is inconsistent in general, unfortunately - if we have
any good tools that can be trusted to reformat, I'd be happy to apply them.
2016-04-06 10:17:13 +01:00
Thomas Van Lenten
c9167f2acd Error during parsing for invalid UTF-8 instead of dropping dropping data.
This seems to be some code evolution side effects. Back when there was a custom
string class, we couldn't really error when we finally saw the string was bad
so we had to return the empty string, but now that full validation is done
up front, it can error out.
2016-04-05 17:16:33 -04:00
Thomas Van Lenten
f3f5b3fb64 Add tests to ensure we read strings with BOMs so we don't forget about lessons of the past. 2016-04-05 17:16:33 -04:00
Jon Skeet
89719f07a3 Merge pull request #1349 from gvaish/master
Added CLI option internal_access for types (C#)
2016-04-05 20:52:17 +01:00
Feng Xiao
f3fe75bae5 Merge pull request #1386 from andrewharp/patch-2
Do not link in pthread library for Android builds.
2016-04-05 10:40:28 -07:00
Gaurav Vaish
74d8b0bebc Added access_level for types
* `csharp_options`: Added `Options` to encapsulate generator options.
   Supported options for now - file_extension, base_namespace
* `{Blah}Generator`: Now accept `Options*` as parameter to constructor
* `csharp_generator.cc`: Parse and populate options
* `Makefile.am`: Added `csharp_options.h`
* `extract_includes.bat.in`: Added `csharp_options.h`

Refactoring code to two commits. This is the first commit
2016-04-05 09:47:11 -07:00
Andrew Harp
3b4e7dcf29 Update BUILD 2016-04-04 16:13:31 -04:00
Andrew Harp
b56b461e49 Do not link in pthread library for Android builds.
This is required to allow Tensorflow to build on Android without hacks. Currently we create a dummy pthread library just to satisfy this dependency for a library that does not exist on Android. See https://github.com/google/protobuf/issues/1373 for more context.
2016-04-04 15:13:30 -04:00
Thomas Van Lenten
a771c9e11c Merge pull request #852 from qzix/master
Added deprecated option handling to objective-c
2016-04-04 11:38:22 -04:00
Oleg Vereshko
268ce2818f Added deprecated option handling for objective-c generator 2016-04-04 18:13:30 +03:00
Jisi Liu
aeacf51602 Merge pull request #1381 from pherl/internal-merge
Merge Google internal changes to an internal branch
2016-04-01 17:22:58 -07:00
Jisi Liu
7630a83767 Merge branch 'master' into internal-merge
Temporarily merges google internal changes. The javascript tests are
still failing and require additional investigation.
2016-04-01 17:17:59 -07:00
Jisi Liu
cba75ad404 Merge branch 'master' of github.com:google/protobuf 2016-04-01 16:46:49 -07:00
Jisi Liu
89343d87c6 Do not use C++11 unicode escape in unittest.
For fixing MSVC
2016-04-01 16:44:46 -07:00
Joshua Haberman
452e2b2c5c Merge pull request #1353 from keveman/master
Linking the cpp implementation extension statically with libprotobuf
2016-04-01 16:14:52 -07:00
Manjunath Kudlur
cf828deb9b Linking the cpp implementation extension statically with libprotobuf 2016-04-01 15:58:48 -07:00
Jisi Liu
93811ca9f7 Do not let windows.h define min/max macros 2016-04-01 15:55:49 -07:00
Jisi Liu
3b6df0612d Allow bigobj for map_unittest 2016-04-01 15:02:45 -07:00
Jon Skeet
9d7a1727e5 Merge pull request #1377 from jskeet/remove-duplicate-tests
Remove duplicate test cases.
2016-04-01 21:28:56 +01:00
Thomas Van Lenten
a293180541 Merge pull request #1378 from thomasvl/manual_stream_parsing_helpers
Add -position and -isAtEnd for use when manually parsing input streams.
2016-04-01 12:37:05 -04:00
Thomas Van Lenten
331cee5022 Add -position and -isAtEnd for use when manually parsing input streams. 2016-04-01 12:26:15 -04:00
Jon Skeet
46e088e2b6 Remove duplicate test cases.
(NCrunch noticed these.)
2016-04-01 17:18:45 +01:00
Jan Tattermusch
099ff1ea14 Merge pull request #1369 from jskeet/tools-nuspec
Introduce a new nuget package, Google.Protobuf.Tools, basically to contain protoc on multiple platforms.
2016-03-31 17:44:40 -07:00
Jisi Liu
203bb5eb33 Fix re-definition issue of winsock.h and winsock2.h 2016-03-31 17:38:11 -07:00
Jisi Liu
1bf446c71e Disable sign-compare warning. 2016-03-31 15:48:25 -07:00
Jisi Liu
7b1cbbd50e Fix signed-compare warning. 2016-03-31 15:38:10 -07:00
Jisi Liu
012ac9a0a6 revert unexpected change for py26 2016-03-31 15:26:22 -07:00
Jisi Liu
bc1f2e7e6e Fix WIN32 build for map_test.
stubs/common.h undefines the GetMessage macro introduced in windows.h
map_test however include stubs/common.h before windows.h is transitively
included. This hack force map_test.cc to include windows.h first, so we
have a chance to undefine the GetMessage macro.
2016-03-31 15:17:40 -07:00
Jisi Liu
cbfd9d43c8 Remove export macros for classes nested in a template class. 2016-03-31 14:47:24 -07:00
Joshua Haberman
81eb84c029 Merge pull request #1371 from keveman/oversize_protos
Added an API to allow oversize protos when using C++ extension in Python
2016-03-31 14:31:05 -07:00
Manjunath Kudlur
1283625b0f Added an API to allow oversize protos when using C++ extension in Python 2016-03-31 14:14:58 -07:00
Jisi Liu
5805c2dfb7 Fix javanano package 2016-03-31 13:50:38 -07:00
Jisi Liu
fc7eeda69c Fix json_format.py in py26 2016-03-31 13:36:32 -07:00
Feng Xiao
5c63266ed3 Merge pull request #1366 from xyzzyz/int128_ostream
Replace #include <iostream> with #include <ostream> in int128.cc
2016-03-31 13:29:29 -07:00
Jisi Liu
94aa50ffd6 Fix breakage of referring to table_ in static func
Referencing data member table_ in static functions break certain
platforms. Change it to refer to the declare type void** instead.
2016-03-31 13:18:03 -07:00
Jisi Liu
9e7fa0678d Temporarily disable begin is fast test. 2016-03-31 13:17:45 -07:00
Jon Skeet
dfd47600d1 Remove duplicate line 2016-03-31 10:46:55 +01:00
Jon Skeet
ca0461c186 Introduce a new nuget package, Google.Protobuf.Tools, basically to contain protoc on multiple platforms.
I've moved both protoc.exe and the proto files out of Google.Protobuf.
The .proto files aren't a slam-dunk, but it feels like they belong with protoc as you'd *use* them with protoc.
It's not clear to me whether we really need both an x86 and x64 version of protoc.exe, as x86 would work on 64-bit Windows anyway. Discuss :)
2016-03-31 07:12:17 +01:00
Jan Tattermusch
a16c8a50f0 Merge pull request #1362 from jskeet/tweak_json_name
Refactoring of FieldDescriptor
2016-03-30 20:30:51 -07:00
Adam Michalik
955841e620 Replace #include <iostream> with #include <ostream>
iostream is not actually necessary here, and it introduces unnecessary
static initializers.
2016-03-30 12:54:40 -07:00
Jisi Liu
0de06f54bc Merge branch 'master' of github.com:google/protobuf 2016-03-30 11:43:44 -07:00