Permalink
Commits on Oct 17, 2018
  1. Merge pull request #5260 from acozzette/common-h-includes

    acozzette committed Oct 17, 2018
    Removed unnecessary includes from stubs/common.h
Commits on Oct 16, 2018
  1. Removed unnecessary includes from stubs/common.h

    acozzette committed Oct 16, 2018
Commits on Oct 11, 2018
  1. Merge pull request #5227 from lopsided98/libatomic-fix

    acozzette committed Oct 11, 2018
    Link to libatomic when necessary (eg. on armv6l)
Commits on Oct 10, 2018
  1. Merge pull request #5244 from KennethL/patch-1

    acozzette committed Oct 10, 2018
    Update third_party.md regarding Erlang
Commits on Oct 8, 2018
  1. Merge pull request #5214 from elharo/parent

    acozzette committed Oct 8, 2018
    remove obsolete parent
Commits on Oct 4, 2018
  1. Merge pull request #5218 from cliffburdick/master

    acozzette committed Oct 4, 2018
    Fixed unsigned warning
Commits on Oct 2, 2018
  1. Merge pull request #5212 from GregTho/win32close

    acozzette committed Oct 2, 2018
    Use ::_close rather than ::close in Win32 stubs.
Commits on Oct 1, 2018
  1. Merge pull request #5210 from jstandish/patch-1

    acozzette committed Oct 1, 2018
    Added VSCode extension link
Commits on Sep 24, 2018
  1. Merge pull request #5172 from shields/smear-comments

    acozzette committed Sep 24, 2018
    Smear comments
Commits on Aug 16, 2018
  1. Merge pull request #5049 from nehaljwani/backport-4854

    acozzette committed Aug 16, 2018
    Backport #4854 to 3.6.x
Commits on Aug 15, 2018
  1. Set LIBPROTOBUF_EXPORT on GzipOutputStream::Options

    acozzette authored and nehaljwani committed Jan 20, 2017
    This fixes issue #2610.
    
    This was originally fixed in a101fa5 , but got
    reverted by d36c0c5
Commits on Aug 7, 2018
  1. Merge pull request #5010 from batradhruv/4593

    acozzette committed Aug 7, 2018
    #4593 Replace all occurrences of "NULL" to nullptr in src/google/proto…
Commits on Aug 1, 2018
  1. Merge pull request #4990 from acozzette/aarch64-build

    acozzette committed Aug 1, 2018
    Added support for building the aarch64 and ppcle64 protoc binaries with Kokoro
  2. Added support for building the aarch64 and ppcle64 protoc binaries wi…

    acozzette committed Jul 27, 2018
    …th Kokoro
    
    This was fairly straightforward using the existing build-protoc.sh
    script. The only problem I ran into was that the x86 Docker builds
    create output directories owned by root, which caused some permission
    issues. Fortunately it was easy to get around that just by doing those
    Docker builds last.
  3. Merge pull request #4991 from acozzette/merge-3-6-x

    acozzette committed Aug 1, 2018
    Merge 3.6.x branch into master
  4. Merge branch '3.6.x' into merge-3-6-x

    acozzette committed Aug 1, 2018
Commits on Jul 31, 2018
  1. Merge pull request #4979 from ripopov/fix-tests-mingw-w64

    acozzette committed Jul 31, 2018
    tests: fix link failure and stack overflow on Mingw w64
Commits on Jul 30, 2018
  1. Updated release documentation (#4973)

    acozzette committed Jul 30, 2018
    I made a few small fixes to the documentation related to publishing
    protoc artifacts:
    - The target directory for Mac should be called osx instead of macos.
    - There needs to be a directory for aarch_64.
    - We need to avoid calling "mvn clean" inside the protoc-artifacts
      directory, since that will delete the contents of the target/
      subdirectory.
Commits on Jul 27, 2018
  1. Updated change log for 3.6.1 release

    acozzette committed Jul 27, 2018
Commits on Jul 20, 2018
  1. Merge pull request #4943 from Stevie-O/fix-unit-tests-on-win32

    acozzette committed Jul 20, 2018
    When running unit tests, read reference files in text mode
Commits on Jul 17, 2018
  1. Updated Docker setup to use GCC 4.8

    acozzette authored and xfxyjwf committed Jul 6, 2018
    Now that we depend on C++11, we need at least GCC 4.8 instead of 4.7.
    This change updates the Docker setup to continue using CentOS 6.6 but
    with GCC 4.8.
    
    I also added libm to the whitelist for dynamically linked libraries for
    the ARM64 protoc binary.
Commits on Jul 9, 2018
  1. Merge pull request #4882 from google/3.6.x

    acozzette committed Jul 9, 2018
    Merge 3.6.x into master
  2. Merge pull request #4878 from acozzette/fix-msvc-initialization

    acozzette committed Jul 9, 2018
    Fix initialization with Visual Studio
  3. Merge pull request #4879 from ejona86/protoc-artifacts-tls12

    acozzette committed Jul 9, 2018
    protoc-artifacts: Update centos base from 6.6 to 6.9
Commits on Jul 6, 2018
  1. Merge pull request #4877 from acozzette/update-docker-setup

    acozzette committed Jul 6, 2018
    Updated Docker setup to use GCC 4.8
  2. Fix initialization with Visual Studio

    acozzette committed Jul 6, 2018
    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.
  3. Merge pull request #4872 from demon386/master

    acozzette committed Jul 6, 2018
    Fix SFINAE in 'RepeatedPtrFieldBase::Add'
  4. Updated Docker setup to use GCC 4.8

    acozzette committed Jul 6, 2018
    Now that we depend on C++11, we need at least GCC 4.8 instead of 4.7.
    This change updates the Docker setup to continue using CentOS 6.6 but
    with GCC 4.8.
    
    I also added libm to the whitelist for dynamically linked libraries for
    the ARM64 protoc binary.
Commits on Jul 2, 2018
  1. Merge pull request #3981 from fahhem/patch-3

    acozzette committed Jul 2, 2018
    Handle srcs in generated files by cd'ing in and out
  2. Merge pull request #4854 from nehaljwani/win-exports

    acozzette committed Jul 2, 2018
    Missing symbol exports for Windows DLL
  3. Merge pull request #4853 from jnordberg/patch-1

    acozzette committed Jul 2, 2018
    Add wsrpc
Commits on Jul 1, 2018
  1. Set LIBPROTOBUF_EXPORT on GzipOutputStream::Options

    acozzette authored and nehaljwani committed Jan 20, 2017
    This fixes issue #2610.
    
    This was originally fixed in a101fa5 , but got
    reverted by d36c0c5
Commits on Jun 27, 2018
  1. Merge pull request #4828 from mmatuszak-google/patch-1

    acozzette committed Jun 27, 2018
    Removed forward declaration of MemBlock class
Commits on Jun 25, 2018
  1. Merge pull request #4827 from acozzette/merge-3-6-x

    acozzette committed Jun 25, 2018
    Merge 3.6.x branch into master