~nnstreamer/+git/protobuf-old:master

Last commit made on 2019-05-29
Get this branch:
git clone -b master https://git.launchpad.net/~nnstreamer/+git/protobuf-old
Members of nnstreamer can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
master
Repository:
lp:~nnstreamer/+git/protobuf-old

Recent commits

beaeaed... by Thomas Van Lenten <email address hidden>

Use runtime_error vs just exiting for some issues.

release notes: no

37297b2... by Amit Portnoy <email address hidden>

avoid error when compiling with MSVC2010

I'm getting `src/google/protobuf/map_field.cc(284): error C2899: typename cannot be used outside a template declaration`

removing `typename` fixes the issue

ca3ead7... by Keith Smiley <email address hidden>

Move tool out of inputs in bazel config

This fixes compatibility with bazel when passing `--incompatible_no_support_tools_in_action_inputs` which will be flipped in an upcoming release.

affe9c2... by Hao Nguyen <email address hidden>

Merge pull request #6161 from haon4/201905211601

Down integrate to GitHub

582927a... by Hao Nguyen <email address hidden>

Update generated files

88339fa... by Hao Nguyen <email address hidden>

Down integrate to GitHub

0c3f43a... by Yilun Chong <email address hidden>

Merge pull request #6158 from TechProofreader/patch-2

Update performance.md

02a4c72... by TechProofreader <email address hidden>

Update performance.md

Even though I just proofread this file, I noticed one more thing that needed correcting, which I fixed. The word "genereated" had to be corrected to "generated". My apologies for missing this on the initial check.

fcfc47d... by Hao Nguyen <email address hidden>

Merge pull request #6151 from haon4/201905171200

Down Integrate to GitHub

1bc8cbe... by Yilun Chong <email address hidden>

Merge pull request #6153 from TechProofreader/patch-1

Update performance.md