From 2dd0809c83261276df36e431e3591f2e701ac594 Mon Sep 17 00:00:00 2001 From: mbutrovich Date: Mon, 11 Jun 2018 11:54:52 -0400 Subject: [PATCH 1/2] Fix warning for unused lambda capture on Clang 9.1 (Mac). --- test/codegen/csv_scan_translator_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/codegen/csv_scan_translator_test.cpp b/test/codegen/csv_scan_translator_test.cpp index 320db518117..0475399f4de 100644 --- a/test/codegen/csv_scan_translator_test.cpp +++ b/test/codegen/csv_scan_translator_test.cpp @@ -36,7 +36,7 @@ class CSVScanTranslatorTest : public PelotonCodeGenTest { TEST_F(CSVScanTranslatorTest, IntCsvScan) { // The quoting character and a helper function to quote a given string const char quote = '"'; - const auto quote_string = [quote](std::string s) { + const auto quote_string = [](std::string s) { return StringUtil::Format("%c%s%c", quote, s.c_str(), quote); }; From 68a39ec6b1230a1abd740f869e21c16b2f83a457 Mon Sep 17 00:00:00 2001 From: saatviks Date: Wed, 13 Jun 2018 14:22:54 -0400 Subject: [PATCH 2/2] Changes to address 1312 --- script/installation/packages.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/script/installation/packages.sh b/script/installation/packages.sh index 080f000944a..dec631fab98 100755 --- a/script/installation/packages.sh +++ b/script/installation/packages.sh @@ -47,6 +47,9 @@ TF_TYPE="cpu" function install_protobuf3.4.0() { # Install Relevant tooling # Remove any old versions of protobuf + # Note: Protobuf 3.5+ PPA available Ubuntu Bionic(18.04) onwards - Should be used + # when we retire 16.04 too: https://launchpad.net/~maarten-fonville/+archive/ubuntu/protobuf + # This PPA unfortunately doesnt have Protobuf 3.5 for 16.04, but does for 14.04/18.04+ DISTRIB=$1 # ubuntu/fedora if [ "$DISTRIB" == "ubuntu" ]; then sudo apt-get --yes --force-yes remove --purge libprotobuf-dev protobuf-compiler @@ -63,7 +66,7 @@ function install_protobuf3.4.0() { wget -O protobuf-cpp-3.4.0.tar.gz https://github.com/google/protobuf/releases/download/v3.4.0/protobuf-cpp-3.4.0.tar.gz tar -xzf protobuf-cpp-3.4.0.tar.gz cd protobuf-3.4.0 - ./autogen.sh && ./configure && make -j4 && sudo make install && sudo ldconfig + ./autogen.sh && ./configure && make -j4 && sudo make install && sudo ldconfig || exit 1 cd .. # Cleanup rm -rf protobuf-3.4.0 protobuf-cpp-3.4.0.tar.gz