aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/stubs
Commit message (Collapse)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-0421-516/+460
|
* Fix failing tests.Feng Xiao2018-08-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix C++ tests. * Add missing files to Makefile.am and fix distcheck in tests.sh * Remove BUILT_SOURCES from conformance/Makefile.am. * Add some missing override keyword. * Add a type cast to int64 because our StrCat() in stubs can't handle size_t. 2. Fix Java tests. * Add missing test dependency on guava in pom.xml. * Include newly referenced test data in test resources. * Manually fix map_lite_test.proto which is overwritten because it's mapped from map_test.proto in google3. * Add back "optimize_for = LITE_RUNTIME" which is still needed to keep the opensource test passing as it's still running lite tests. * Add a type cast in newBuilder() because without it the code doesn't compile with openjdk javac 1.8 (the compiler can't figure if it's the right type due to complex generic typing). 3. Fix Python tests. * Remove/replace references to <hash_map>. * Suppress more warnings in setup.py. * Replace incorrect header inclusion for google/protobuf/proto_api.h. * Add strings::EndsWith to google/protobuf/stubs/strutil.h because it's referenced in the updated python C extension code. * Replace proto2 with google::protobuf. The proto2 name is leaked to opensource because we removed the subsitition rule for proto2 namespace but only fixed C++ source code and forgot to update python C extension code.
* Merge master branch.Feng Xiao2018-08-0824-153/+153
|\
| * 4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubsDhruv2018-08-0723-148/+148
| |
| * Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-011-5/+5
| |\
| | * Updated version numbers to 3.6.1Adam Cozzette2018-07-271-5/+5
| | |
* | | Down-integrate from google3.Feng Xiao2018-08-087-332/+166
|/ /
* | OnShutdownDelete shadowing issueIvan Shynkarenka2018-07-101-1/+1
| | | | | | | | https://github.com/google/protobuf/issues/4887
* | Merge pull request #4882 from google/3.6.xAdam Cozzette2018-07-092-49/+30
|\| | | | | Merge 3.6.x into master
| * Fix initialization with Visual StudioAdam Cozzette2018-07-062-49/+30
| | | | | | | | | | | | | | | | | | | | | | | | It appears that Visual Studio does not work well with std::once_flag because it has a bug causing it to initialize that during dynamic initialization instead of constant initialization. This change works around the problem by using function static initializers instead. @gerben-s originally wrote this change for the Google-internal codebase but I am just cherry-picking it here. This fixes #4773.
* | Fix to allow a compilation under mips big endian with gccCharles Hardin2018-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The __MIPSEL__ is mips little endian, specific and we needed to compile for a big endian mips target that also happened to be a mips64, so replaced the __MIPSEL__ with a __mip__ which should preserve the build on little endian and allow a build for a big endian setup. $ echo | mips64-linux-gcc -E -dM - ... snip snip ... #define __mips__ 1 #define __MIPSEB__ 1 Signed-off-by: Charles Hardin <ckhardin@gmail.com>
* | Removed forward declaration of MemBlock classMichal Matuszak2018-06-251-1/+0
| | | | | | | | | | Removed forward declaration of MemBlock class. Declaration is in conflict with declaration `::strings::MemBlock`
* | Merge pull request #4827 from acozzette/merge-3-6-xAdam Cozzette2018-06-251-5/+5
|\ \ | | | | | | Merge 3.6.x branch into master
| * | Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-06-251-5/+5
| |\|
| | * Update version number to 3.6.0Jisi Liu2018-05-141-5/+5
| | |
* | | Merge pull request #4824 from sschuberth/remove-exec-bitFeng Xiao2018-06-251-0/+0
|\ \ \ | | | | | | | | Remove the executable bit from several source code files
| * | | Remove the executable bit from several source code filesSebastian Schuberth2018-06-251-0/+0
| |/ / | | | | | | | | | This potentially avoids compiler warnings.
* | | Merge pull request #4608 from khuzemap/masterFeng Xiao2018-06-252-23/+23
|\ \ \ | | | | | | | | Add "override" keyword for overridden virtual functions
| * | | Add "override" for overridden virtual functionsKhuzema Pithewan2018-06-192-23/+23
| | |/ | |/| | | | | | | | | | | | | Add "override" for overridden virtual functions. Please refer following issue for discussion on this. https://github.com/google/protobuf/issues/67
* | | Merge pull request #4172 from OskarKinomoto/masterAdam Cozzette2018-06-251-0/+8
|\ \ \ | |_|/ |/| | Add guards against bswap_XX redefnitions
| * | Add guards against bswap_XX redefnitionsOskar Świtalski2018-01-151-0/+8
| | | | | | | | | | | | Signed-off-by: Oskar Świtalski <oskar.switalski@indoorway.com>
* | | Merge pull request #1261 from gjasny/disable-tls-for-osx-10.6Adam Cozzette2018-06-201-0/+6
|\ \ \ | | | | | | | | Disable thread local storage for OSX < 10.7
| * | | Disable thread local storage for OSX < 10.7Gregor Jasny2016-02-191-0/+6
| | | |
* | | | Added Clang thread-safety annotations in mutex.hAdam Cozzette2018-05-301-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Clang's thread safety analysis (-Wthread-safety) to pass without warnings, we need to annotate WrappedMutex to indicate that Lock() acquires the lock and Unlock() releases it. This CL adds the annotations and guards them with an ifdef to make sure they're a no-op on compilers other than Clang. This is a cherry-pick of a change I already made to the Google-internal codebase.
* | | | re-write int128 long division to avoid license impact from stackoverflow ↵NickFengIBM2018-05-171-34/+18
| |_|/ |/| | | | | | | | | | | | | | | | | references (#4633) * rewrite int128 long divison to avoid stackoverflow hit Protobuf was showing Stackoverflow hits in the code base, primarily code written to calculate long division. This code was copied from a stackoverflow post, which means it would be licensed under CC BY-SA 3.0. Due to this license, IBM Legal did not want to include this OSS in our products and advised us to re-write this particular piece of code to avoid the license restriction. We have re-written the code for our own distribution, and are willing to merge it into the main code base for others who want to avoid the stackoverflow license issues to benefit as well.
* | | MinGW build failedIvan Shynkarenka2018-05-021-1/+1
| | |
* | | Removed atomicops.h since it is no longer usedAdam Cozzette2018-03-271-237/+0
| | |
* | | Removed some unused C++ source filesAdam Cozzette2018-03-2220-4897/+0
| | |
* | | Merge pull request #4387 from acozzette/down-integrateAdam Cozzette2018-03-2014-422/+80
|\ \ \ | | | | | | | | Integrated internal changes from Google
| * | | Deleted scoped_ptr.hAdam Cozzette2018-03-145-255/+8
| | | | | | | | | | | | | | | | | | | | We no longer need this, now that we have finished the switch to C++11 and are using std::unique_ptr.
| * | | Merge branch 'master' into down-integrateAdam Cozzette2018-03-131-1/+2
| |\ \ \
| * | | | Integrated internal changes from GoogleAdam Cozzette2018-03-1310-179/+84
| | | | |
* | | | | Merge pull request #4371 from Rasrack/gnuc_minorAdam Cozzette2018-03-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix spelling error of __GNUC_MINOR__
| * | | | | Fix spelling error of __GNUC_MINOR__Adam Aili2018-03-101-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #4310 from KindDragon/patch-1Feng Xiao2018-03-141-6/+9
|\ \ \ \ \ | |/ / / / |/| | | | Support using MSVC intrinsics in Log2FloorNonZero
| * | | | Support using MSVC intrinsics in Log2FloorNonZeroArkady Shapkin2018-02-151-6/+9
| |/ / /
* | | | Merge pull request #4183 from pcc/win-libcxxFeng Xiao2018-02-261-1/+2
|\ \ \ \ | |/ / / |/| | | Add support for libc++ on Windows.
| * | | Add support for libc++ on Windows.Peter Collingbourne2018-01-171-1/+2
| | |/ | |/| | | | | | | | | | This disables a couple of workarounds which are only necessary with MSVC's standard library and cause problems with libc++.
* | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.Nico Weber2018-02-071-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chrome is running into two issues with the use of this macro in open-source protobuf (https://crbug.com/809157): 1. GOOGLE_FALLTHROUGH_INTENDED is defined to nothing on __APPLE__ platforms, which blocks us from enabling -Wimplicit-fallthrough on Mac and iOS. (We use a hermetic self-built modern clang, so whatever Xcode bug that exclusion might be for doesn't apply to us.) 2. It's in a public header file, and it's included in a public header file. When clang suggests adding [[clang::fallthrough]], it checks if it knows of a macro expanding to that and if so, suggests inserting that. Since lots of chrome code includes protobuf headers, it often suggests inserting GOOGLE_FALLTHROUGH_INTENDED (from protobuf) instead of the correct FALLTHROUGH (from chrome's base). Since the fallthrough doens't do anyting useful, just remove it. Long ago, this might have had perf impact, but d64a2d9941c36a7bc added a parsing fast path that calls this switch as slow fallback, so it should be off the hot path nowadays. No intended behavior change. This is the public version of internal change 184824132.
* | | Removed using statements from common.hAdam Cozzette2018-01-2613-38/+33
|/ / | | | | | | | | | | These statements pulled a bunch of symbols from the std namespace into the global namespace. This commit removes all of them except for std::string, which is a bit trickier to remove.
* | Merge pull request #4148 from datacompboy/patch-2Adam Cozzette2018-01-081-0/+53
|\ \ | | | | | | Add more tests to time_test
| * | Update time_test.ccAnton Fedorov2018-01-051-0/+53
| | | | | | | | | Better test coverage for datetime validation.
* | | Fix ValidateDateTime: check day instead monthAnton Fedorov2018-01-051-2/+2
|/ / | | | | | | Found with PVS-Studio static analyser, see https://www.viva64.com/en/b/0550/
* | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-1/+1
|\ \
| * | remove nullptrJisi Liu2018-01-021-1/+1
| | |
* | | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-034-128/+276
|\| |
| * | Add support for Windows ARM64 buildMiradham Kamilov2017-12-201-0/+3
| | |
| * | Update version number to 3.5.1Jisi Liu2017-12-191-1/+1
| | |
| * | io_win32_unittest: remove incorrect error checkLaszlo Csomor2017-12-071-3/+3
| | | | | | | | | | | | | | | | | | Unlike GetEnvironmentVariableW, GetCurrentDirectoryW doesn't set ERROR_INSUFFICIENT_BUFFER.
| * | io_win32_unittest: fix condition in GetCwdAsUtf8Laszlo Csomor2017-12-071-1/+1
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 15:46:10 +0000