1. 31 Jan, 2017 1 commit
    • Paul Yang's avatar
      Merge 3.2.x branch into master (#2648) · 7f3e2370
      Paul Yang authored
      * Down-integrate internal changes to github.
      
      * Update conformance test failure list.
      
      * Explicitly import used class in nano test to avoid random test fail.
      
      * Update _GNUC_VER to use the correct implementation of atomic operation
      on Mac.
      
      * maps_test.js: check whether Symbol is defined before using it (#2524)
      
      Symbol is not yet available on older versions of Node.js and so this
      test fails with them. This change just directly checks whether Symbol is
      available before we try to use it.
      
      * Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up
      
      * Updated Makefile.am to fix out-of-tree builds
      
      * Added Bazel genrule for generating well_known_types_embed.cc
      
      In pull request #2517 I made this change for the CMake and autotools
      builds but forgot to do it for the Bazel build.
      
      * Update _GNUC_VER to use the correct implementation of atomic operation on Mac.
      
      * Add new js file in extra dist.
      
      * Bump version number to 3.2.0
      
      * Fixed issue with autoloading - Invalid paths (#2538)
      
      * PHP fix int64 decoding (#2516)
      
      * fix int64 decoding
      
      * fix int64 decoding + tests
      
      * Fix int64 decoding on 32-bit machines.
      
      * Fix warning in compiler/js/embed.cc
      
      embed.cc: In function ‘std::string CEscape(const string&)’:
      embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
         for (int i = 0; i < str.size(); ++i) {
                                      ^
      
      * Fix include in auto-generated well_known_types_embed.cc
      
      Restore include style fix (e3da722b) that has been trampled by
      auto-generation of well_known_types_embed.cc
      
      * Fixed cross compilations with the Autotools build
      
      Pull request #2517 caused cross compilations to start failing, because
      the js_embed binary was being built to run on the target platform
      instead of on the build machine. This change updates the Autotools build
      to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for
      the build machine and always use that when building js_embed.
      
      * Minor fix for autocreated object repeated fields and maps.
      
      - If setting/clearing a repeated field/map that was objects, check the class
        before checking the autocreator.
      - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated
        classes to ensure there is less chance of issues if someone does something
        really crazy threading wise.
      - Some more tests for the internal AutocreatedArray/AutocreatedDictionary
        classes to ensure things are working as expected.
      - Add Xcode 8.2 to the full_mac_build.sh supported list.
      
      * Fix generation of extending nested messages in JavaScript (#2439)
      
      * Fix generation of extending nested messages in JavaScript
      
      * Added missing test8.proto to build
      
      * Fix generated code when there is no namespace but there is enum definition.
      
      * Decoding unknown field should succeed.
      
      * Add embed.cc in src/Makefile.am to fix dist check.
      
      * Fixed "make distcheck" for the Autotools build
      
      To make the test pass I needed to fix out-of-tree builds and update
      EXTRA_DIST and CLEANFILES.
      
      * Remove redundent embed.cc from src/Makefile.am
      
      * Update version number to 3.2.0-rc.1 (#2578)
      
      * Change protoc-artifacts version to 3.2.0-rc.1
      
      * Update version number to 3.2.0rc2
      
      * Update change logs for 3.2.0 release.
      
      * Update php README
      
      * Update upb, fixes some bugs (including a hash table problem). (#2611)
      
      * Update upb, fixes some bugs (including a hash table problem).
      
      * Ruby: added a test for the previous hash table corruption.
      
      Verified that this triggers the bug in the currently released
      version.
      
      * Ruby: bugfix for SEGV.
      
      * Ruby: removed old code for dup'ing defs.
      
      * Reverting deployment target to 7.0 (#2618)
      
      The Protobuf library doesn’t require the 7.1 deployment target so
      reverting it back to 7.0
      
      * Fix typo that breaks builds on big-endian (#2632)
      
      * Bump version number to 3.2.0
      7f3e2370
  2. 24 Feb, 2016 2 commits
  3. 13 Jan, 2016 1 commit
  4. 09 Nov, 2015 1 commit
  5. 03 Nov, 2015 1 commit
    • Jon Skeet's avatar
      Implement JSON parsing in C#. · fb248822
      Jon Skeet authored
      This includes all the well-known types except Any.
      Some aspects are likely to require further work when the details of the JSON parsing expectations are hammered out in more detail. Some of these have "ignored" tests already.
      
      Note that the choice *not* to use Json.NET was made for two reasons:
      - Going from 0 dependencies to 1 dependency is a big hit, and there's not much benefit here
      - Json.NET parses more leniently than we'd want; accommodating that would be nearly as much work as writing the tokenizer
      This only really affects the JsonTokenizer, which could be replaced by Json.NET. The JsonParser code would be about the same length with Json.NET... but I wouldn't be as confident in it.
      fb248822
  6. 11 Nov, 2014 1 commit
  7. 01 Oct, 2014 1 commit
  8. 18 Jul, 2014 1 commit
  9. 02 Nov, 2010 1 commit
  10. 29 Jul, 2009 1 commit
  11. 22 Oct, 2008 1 commit
  12. 24 Sep, 2008 1 commit
    • kenton@google.com's avatar
      Integrate changes from internal Google-internal branch. · 24bf56fb
      kenton@google.com authored
        General
        * License changed from Apache 2.0 to New BSD.
        * It is now possible to define custom "options", which are basically
          annotations which may be placed on definitions in a .proto file.
          For example, you might define a field option called "foo" like so:
            import "google/protobuf/descriptor.proto"
            extend google.protobuf.FieldOptions {
              optional string foo = 12345;
            }
          Then you annotate a field using the "foo" option:
            message MyMessage {
              optional int32 some_field = 1 [(foo) = "bar"]
            }
          The value of this option is then visible via the message's
          Descriptor:
            const FieldDescriptor* field =
              MyMessage::descriptor()->FindFieldByName("some_field");
            assert(field->options().GetExtension(foo) == "bar");
          This feature has been implemented and tested in C++ and Java.
          Other languages may or may not need to do extra work to support
          custom options, depending on how they construct descriptors.
      
        C++
        * Fixed some GCC warnings that only occur when using -pedantic.
        * Improved static initialization code, making ordering more
          predictable among other things.
        * TextFormat will no longer accept messages which contain multiple
          instances of a singular field.  Previously, the latter instance
          would overwrite the former.
        * Now works on systems that don't have hash_map.
      
        Python
        * Strings now use the "unicode" type rather than the "str" type.
          String fields may still be assigned ASCII "str" values; they will
          automatically be converted.
        * Adding a property to an object representing a repeated field now
          raises an exception.  For example:
            # No longer works (and never should have).
            message.some_repeated_field.foo = 1
      24bf56fb
  13. 14 Aug, 2008 1 commit
  14. 10 Jul, 2008 1 commit