Joshua Haberman
814685ca2c
Merge pull request #1397 from google/internal-merge
...
Internal merge
9 years ago
Josh Haberman
3c4ce528c6
Fix for gulpfile.js.
9 years ago
Jan Tattermusch
3ffbdd712f
Merge pull request #1400 from jskeet/fix-internal
...
Fix to csharp_options - initialize internal_access to false.
9 years ago
Jon Skeet
0a902ee0ac
Fix to csharp_options - initialize internal_access to false.
9 years ago
Josh Haberman
2cd79bf3a8
Removed duplicated operator delete from merge conflict.
9 years ago
Josh Haberman
4465daa57a
Merge branch 'master' into internal-merge
9 years ago
Jon Skeet
667f4a6282
Merge pull request #1393 from gvaish/master
...
Added support for internal_access for C#
9 years ago
Josh Haberman
15239361e3
Fix for CommonJS tests.
9 years ago
Jie Luo
09292d5759
Merge pull request #1392 from anandolee/master
...
Sync the manually integrate changes in google3/third_party
9 years ago
Gaurav Vaish
a6e39316a7
Added support for internal_access for C#
9 years ago
Jon Skeet
cef46e115a
Merge pull request #1390 from jskeet/tidy-up
...
Tidy up for C# codegen
9 years ago
Jie Luo
c61207492e
sync the Manually integrate changes in google3/third_party
9 years ago
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
9 years ago
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.
9 years ago
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.)
9 years ago
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.
9 years ago
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.
9 years ago
Thomas Van Lenten
f3f5b3fb64
Add tests to ensure we read strings with BOMs so we don't forget about lessons of the past.
9 years ago
Jon Skeet
89719f07a3
Merge pull request #1349 from gvaish/master
...
Added CLI option internal_access for types (C#)
9 years ago
Feng Xiao
f3fe75bae5
Merge pull request #1386 from andrewharp/patch-2
...
Do not link in pthread library for Android builds.
9 years ago
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
9 years ago
Andrew Harp
3b4e7dcf29
Update BUILD
9 years ago
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.
9 years ago
Thomas Van Lenten
a771c9e11c
Merge pull request #852 from qzix/master
...
Added deprecated option handling to objective-c
9 years ago
Oleg Vereshko
268ce2818f
Added deprecated option handling for objective-c generator
9 years ago
Jisi Liu
aeacf51602
Merge pull request #1381 from pherl/internal-merge
...
Merge Google internal changes to an internal branch
9 years ago
Jisi Liu
7630a83767
Merge branch 'master' into internal-merge
...
Temporarily merges google internal changes. The javascript tests are
still failing and require additional investigation.
9 years ago
Jisi Liu
cba75ad404
Merge branch 'master' of github.com:google/protobuf
9 years ago
Jisi Liu
89343d87c6
Do not use C++11 unicode escape in unittest.
...
For fixing MSVC
9 years ago
Joshua Haberman
452e2b2c5c
Merge pull request #1353 from keveman/master
...
Linking the cpp implementation extension statically with libprotobuf
9 years ago
Manjunath Kudlur
cf828deb9b
Linking the cpp implementation extension statically with libprotobuf
9 years ago
Jisi Liu
93811ca9f7
Do not let windows.h define min/max macros
9 years ago
Jisi Liu
3b6df0612d
Allow bigobj for map_unittest
9 years ago
Jon Skeet
9d7a1727e5
Merge pull request #1377 from jskeet/remove-duplicate-tests
...
Remove duplicate test cases.
9 years ago
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.
9 years ago
Thomas Van Lenten
331cee5022
Add -position and -isAtEnd for use when manually parsing input streams.
9 years ago
Jon Skeet
46e088e2b6
Remove duplicate test cases.
...
(NCrunch noticed these.)
9 years ago
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.
9 years ago
Jisi Liu
203bb5eb33
Fix re-definition issue of winsock.h and winsock2.h
9 years ago
Jisi Liu
1bf446c71e
Disable sign-compare warning.
9 years ago
Jisi Liu
7b1cbbd50e
Fix signed-compare warning.
9 years ago
Jisi Liu
012ac9a0a6
revert unexpected change for py26
9 years ago
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.
9 years ago
Jisi Liu
cbfd9d43c8
Remove export macros for classes nested in a template class.
9 years ago
Joshua Haberman
81eb84c029
Merge pull request #1371 from keveman/oversize_protos
...
Added an API to allow oversize protos when using C++ extension in Python
9 years ago
Manjunath Kudlur
1283625b0f
Added an API to allow oversize protos when using C++ extension in Python
9 years ago
Jisi Liu
5805c2dfb7
Fix javanano package
9 years ago
Jisi Liu
fc7eeda69c
Fix json_format.py in py26
9 years ago
Feng Xiao
5c63266ed3
Merge pull request #1366 from xyzzyz/int128_ostream
...
Replace #include <iostream> with #include <ostream> in int128.cc
9 years ago
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.
9 years ago