aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add more warnings to for the ObjC runtime buildThomas Van Lenten2016-05-253-2/+45
| | | | | | | | | | | | | | Working on https://github.com/google/protobuf/issues/1599, specifically: - Turn on more warnings that the Xcode UI calls out with individual controls. - Manually add: -Wundef -Wswitch-enum - Manually add and then diable in the unittests because of XCTest's headers: -Wreserved-id-macro -Wdocumentation-unknown-command - Manually add -Wdirect-ivar-access, but disable it for the unittests and in the library code (via #pragmas to suppress it). This is done so proto users can enable the warning.
* Better support for using the proto library from a framework.Thomas Van Lenten2016-05-244-48/+199
| | | | | | | | | | | | | | - Add generator constant for the default framework name. - Add generator api for making the CPP symbol from the name. - Add generator api to see if it is a bundled proto file. - Output a CPP conditional and two imports for the core library headers. - Add helper for generating the #import for file headers to deal with the framework imports. - Add a reference from the unittests to a WKT to use that to inspect how imports generate. - Update the podspec to define the CPP symbol and require pods 1.0 (or later). Fixes https://github.com/google/protobuf/issues/1457
* Merge pull request #1549 from xyzzyz/arena_exportJoshua Haberman2016-05-181-1/+1
|\ | | | | Export class Arena to shared library.
| * Export class Arena to shared library.Adam Michalik2016-05-171-1/+1
| | | | | | | | | | This got broken in commit 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e which integrated changes from internal branch.
* | Merge pull request #1547 from xyzzyz/js_generatorJoshua Haberman2016-05-181-1/+1
|\ \ | | | | | | Fix #include in js_generator.cc
| * | Fix #include in js_generator.ccAdam Michalik2016-05-171-1/+1
| |/ | | | | | | | | The commit 3b3c8abb9635eb3ea078a821a99c9ef29d66dff7 has replaced the <> with "" in #include statement in js_generator.cc
* / Integrate interanl changesBo Yang2016-05-182-1/+2
|/
* Merge pull request #1542 from google/beta-3Jisi Liu2016-05-163-9/+60
|\ | | | | Merge Beta 3 release branch into master
| * Remove the comments about iterator validationJisi Liu2016-05-131-3/+1
| | | | | | | | As it may be implementation dependent.
| * Merge pull request #1520 from pherl/hashmapvs2008Jisi Liu2016-05-121-3/+55
| |\ | | | | | | Bridge vs2008 hashmaps.
| | * Bridge vs2008 hashmaps.Jisi Liu2016-05-111-3/+55
| | |
| * | Fix the command line interface unittest againJisi Liu2016-05-101-3/+4
| |/ | | | | | | | | This time move the macro inside namespaces; hopefully will work with the integration script.
* | Merge pull request #1483 from wal-rus/fix-boost-incompatibilityFeng Xiao2016-05-111-3/+1
|\ \ | |/ |/| Fix C++ Boost incompatibility on Windows/MSVC
| * Remove confounding and unused #define - breaks boost/predef/other/endian.hWalter Gray2016-05-061-3/+1
| |
* | Merge pull request #1499 from beardedN5rd/masterFeng Xiao2016-05-061-1/+4
|\ \ | | | | | | updated README
| * | after comment of Feng Xiao changed the entry to g++beardedn5rd2016-05-061-2/+2
| | |
| * | updated READMEbeardedn5rd2016-05-061-1/+4
| |/
* | Updated README.mdMahmut Ali ÖZKURAN2016-05-061-1/+1
| | | | | | Added relative link to cmake guide.
* | Merge pull request #1409 from eeight/fix_enum_corruptionFeng Xiao2016-05-043-2/+50
|\ \ | |/ |/| Fix bug with silent message corruption in LITE_RUNTIME.
| * Fix bug with silent message corruption in LITE_RUNTIME.Petr Prokhorenkov2016-04-213-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A protobuf message will be corrupted in the following scenario: 1. Use LITE_RUNTIME. 2. Have an optional enum field following some other field. 3. Update protocol by adding new values to the enum. 4. Have an old client parse and serialize a message having enum field set to a value the client does not understand. 5. Field preceeding the enum is now corrupted. The bug is due to the fact that optimized fallthrough in parser code does not update variablle 'tag' when jumping to the parser code for the next field.
* | Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-2811-4/+839
|\ \
| * | Proper checking of enum with non zero defaultThomas Van Lenten2016-04-261-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | proto2 syntax allows the first enum to have a non zero value. This means any field using that default has a non zero default without having an explicit default being set. So when deciding what runtime info is needed, don't rely on an explicit default, always check that the values aren't zero. Fixes https://github.com/google/protobuf/issues/1453
| * | Merge pull request #1416 from cwhipkey/masterFeng Xiao2016-04-208-29/+739
| |\ \ | | | | | | | | Change protobuf CPP proto generator to support the 'lite' option in
| | * | Change protobuf CPP proto generator to support the 'lite' option inChad Whipkey2016-04-158-29/+739
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | proto3. Added a couple unit test proto3 files, for arena_lite and lite. Cloned the proto3_arena_unittest to test some of the basics of generated code (and to ensure that the generated proto3 test files are used by some test).
* | / Down integrate from Google internal.Jisi Liu2016-04-28105-1225/+2343
|/ /
* | Merge pull request #1414 from xyzzyz/googletestFeng Xiao2016-04-201-1/+0
|\ \ | | | | | | Remove googletest.h header from stringprintf.cc
| * | Remove googletest.h header from stringprintf.ccAdam Michalik2016-04-141-1/+0
| | | | | | | | | | | | | | | It doesn't seem to be necessary here, and it pulls other testing headers during compilation of release protobuf.
* | | Merge pull request #1401 from jskeet/enum-casingJon Skeet2016-04-207-7/+152
|\ \ \ | | | | | | | | Enum casing in C#
| * | | Attempt to fix AppVeyor build by exporting GetEnumValueNameJon Skeet2016-04-202-1/+9
| | | |
| * | | Add C# codegen changes to enum value names (mostly C++)Jon Skeet2016-04-206-6/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overview of changes: - A new C#-specific command-line option, legacy_enum_values to revert to the old behavior - When legacy_enum_values isn't specified, we strip the enum name as a prefix, and PascalCase the value name - A new attribute within the C# code so that we can always tell the original in-proto name Regenerating the C# code with legacy_enum_values leads to code which still compiles and works - but there's more still to do.
| * | | Use 0 as the default value for all enums, rather than finding the actual ↵Jon Skeet2016-04-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | enum value name This will make it easier to change the enum value names, as it reduces the number of places they're used.
* | | | Add missing includes in field mask testJisi Liu2016-04-191-0/+2
| |_|/ |/| |
* | | Merge pull request #1397 from google/internal-mergeJoshua Haberman2016-04-11145-1427/+5132
|\ \ \ | |/ / |/| | Internal merge
| * | Removed duplicated operator delete from merge conflict.Josh Haberman2016-04-071-6/+0
| | |
| * | Merge branch 'master' into internal-mergeJosh Haberman2016-04-0737-113/+303
| |\ \
| * \ \ Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-011-1/+1
| |\ \ \
| * | | | Do not use C++11 unicode escape in unittest.Jisi Liu2016-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | For fixing MSVC
| * | | | Do not let windows.h define min/max macrosJisi Liu2016-04-011-0/+1
| | | | |
| * | | | Fix re-definition issue of winsock.h and winsock2.hJisi Liu2016-03-311-0/+1
| | | | |
| * | | | Fix WIN32 build for map_test.Jisi Liu2016-03-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Remove export macros for classes nested in a template class.Jisi Liu2016-03-311-3/+3
| | | | |
| * | | | Fix javanano packageJisi Liu2016-03-311-0/+3
| | | | |
| * | | | Fix breakage of referring to table_ in static funcJisi Liu2016-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Referencing data member table_ in static functions break certain platforms. Change it to refer to the declare type void** instead.
| * | | | Temporarily disable begin is fast test.Jisi Liu2016-03-311-1/+2
| | | | |
| * | | | Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-3020-319/+485
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Integrate google internal changes.Jisi Liu2016-03-30145-1440/+5155
| | | | |
* | | | | Fix to csharp_options - initialize internal_access to false.Jon Skeet2016-04-081-1/+2
| | | | |
* | | | | Merge pull request #1393 from gvaish/masterJon Skeet2016-04-073-1/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | Added support for internal_access for C#
| * | | | Added support for internal_access for C#Gaurav Vaish2016-04-073-1/+6
| | | | |
* | | | | Merge pull request #1392 from anandolee/masterJie Luo2016-04-078-19/+41
|\ \ \ \ \ | |/ / / / |/| | | | Sync the manually integrate changes in google3/third_party
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 02:46:25 +0000