tree 48a2e5dd135049102b451cb79c62daeb06fd972b
parent 656bbbef4152065e498ec3d5cf43bd08820da9b3
parent 61f86d9bd795a65d94df72a47fbd313d9084d8e7
author Craig Tiller <ctiller@google.com> 1495129268 -0700
committer GitHub <noreply@github.com> 1495129268 -0700

Merge pull request #11093 from ctiller/c++compat4

C++ compatibility fixes