pull upstream/master

probtorch · Apr 12, 2018 · e574da2 · e574da2
1 parent f6e8b86
commit e574da2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/third_party/gloo b/third_party/gloo
diff --git a/third_party/nanopb b/third_party/nanopb
diff --git a/third_party/pybind11 b/third_party/pybind11
+0 −1		.travis/build.sh
+0 −11		.travis/install.sh
+8 −24		README.md
+12 −10		cmake/Dependencies.cmake
+1 −8		cmake/Modules/Findnccl.cmake
+0 −2		gloo/examples/CMakeLists.txt
+0 −136		gloo/examples/example1.cc
+4 −4		gloo/test/CMakeLists.txt
+0 −9		gloo/transport/device.h
+1 −0		third-party/googletest
+12 −6		.travis.yml
+8 −0		AUTHORS.txt
+16 −0		CHANGELOG.txt
+8 −4		CMakeLists.txt
+8 −2		docs/concepts.rst
+21 −11		docs/reference.rst
+2 −6		examples/network_server/client.c
+6 −2		examples/network_server/server.c
+1 −1		examples/simple/simple.c
+3 −0		examples/using_union_messages/README.txt
+52 −25		extra/FindNanopb.cmake
+3 −0		generator/nanopb/options.proto
+84 −16		generator/nanopb_generator.py
+185 −27		generator/proto/google/protobuf/descriptor.proto
+3 −0		generator/proto/nanopb.proto
+1 −1		library.json
+11 −1		pb.h
+161 −44		pb_decode.c
+22 −0		pb_decode.h
+88 −22		pb_encode.c
+16 −0		pb_encode.h
+1 −1		tests/SConstruct
+10 −0		tests/alltypes/SConscript
+1 −1		tests/alltypes/alltypes.proto
+144 −66		tests/alltypes/decode_alltypes.c
+69 −66		tests/alltypes/encode_alltypes.c
+1 −1		tests/alltypes_proto3/SConscript
+1 −1		tests/anonymous_oneof/SConscript
+11 −0		tests/decode_unittests/decode_unittests.c
+3 −0		tests/field_size_16/SConscript
+1 −1		tests/field_size_16/alltypes.proto
+1 −1		tests/field_size_16_proto3/SConscript
+3 −0		tests/field_size_32/SConscript
+1 −1		tests/field_size_32/alltypes.proto
+14 −0		tests/fixed_count/SConscript
+21 −0		tests/fixed_count/fixed_count.proto
+116 −0		tests/fixed_count/fixed_count_unittests.c
+21 −0		tests/map/SConscript
+60 −0		tests/map/decode_map.c
+37 −0		tests/map/encode_map.c
+2 −0		tests/map/map.options
+6 −0		tests/map/map.proto
+1 −1		tests/oneof/SConscript
+8 −8		tests/site_scons/site_init.py
+49 −0		tests/without_64bit/SConscript
+3 −0		tests/without_64bit/alltypes.options
+100 −0		tests/without_64bit/alltypes.proto
+185 −0		tests/without_64bit/decode_alltypes.c
+124 −0		tests/without_64bit/encode_alltypes.c
+14 −0		tests/without_64bit/no_64bit_syshdr.h
+9 −7		tools/make_linux_package.sh
+1 −1		.travis.yml
+0 −3		docs/advanced/cast/stl.rst
+1 −1		docs/advanced/functions.rst
+26 −7		docs/advanced/misc.rst
+65 −0		docs/changelog.rst
+2 −2		docs/faq.rst
+9 −2		include/pybind11/cast.h
+29 −38		include/pybind11/detail/common.h
+5 −5		include/pybind11/pybind11.h
+2 −1		include/pybind11/stl.h
+1 −1		tests/test_eigen.cpp
+2 −2		tests/test_numpy_dtypes.py
+7 −3		tests/test_opaque_types.cpp
+3 −1		tests/test_virtual_functions.cpp