Fix -Wvexing-parse warnings with clang-6
Change-Id: I577ace832d2d2af7cf7bdef8adfd6c10ba2711d7
diff --git a/.travis.yml b/.travis.yml
index 61c1139..d378bfe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
+language: cpp
+dist: trusty
sudo: required
-language: generic
env:
global:
- JOB_NAME=limited-build
@@ -8,150 +9,102 @@
matrix:
include:
# Linux/gcc
+ # https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test/+packages
- os: linux
- dist: trusty
- env:
- - CXX=g++-4.8
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
- - BUILD_WITH_ASAN=yes
+ env: COMPILER=g++-4.8
- os: linux
- dist: trusty
+ env: COMPILER=g++-4.9
addons:
apt:
sources: ubuntu-toolchain-r-test
packages: g++-4.9
- env:
- - CXX=g++-4.9
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
- - BUILD_WITH_ASAN=yes
- os: linux
- dist: trusty
+ env: COMPILER=g++-5
addons:
apt:
sources: ubuntu-toolchain-r-test
packages: g++-5
- env:
- - CXX=g++-5
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
- - BUILD_WITH_ASAN=yes
- os: linux
- dist: trusty
+ env: COMPILER=g++-6
addons:
apt:
sources: ubuntu-toolchain-r-test
packages: g++-6
- env:
- - CXX=g++-6
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
- - BUILD_WITH_ASAN=yes
- os: linux
- dist: trusty
+ env: COMPILER=g++-7
addons:
apt:
sources: ubuntu-toolchain-r-test
packages: g++-7
- env:
- - CXX=g++-7
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
- - BUILD_WITH_ASAN=yes
# Linux/clang
+ # https://apt.llvm.org/
- os: linux
- dist: trusty
+ env: COMPILER=clang++-3.5
addons:
apt:
packages: clang-3.5
- env:
- - CXX=clang++-3.5
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
- - BUILD_WITH_ASAN=yes
- os: linux
- dist: trusty
+ env: COMPILER=clang++-3.6
addons:
apt:
packages: clang-3.6
- env:
- - CXX=clang++-3.6
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
- - BUILD_WITH_ASAN=yes
- os: linux
- dist: trusty
+ env: COMPILER=clang++-3.7 DISABLE_ASAN=yes
addons:
apt:
- sources:
- - llvm-toolchain-precise-3.7
- - ubuntu-toolchain-r-test
+ sources: ["llvm-toolchain-precise-3.7", "ubuntu-toolchain-r-test"]
packages: clang-3.7
- env:
- - CXX=clang++-3.7
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
- os: linux
- dist: trusty
+ env: COMPILER=clang++-3.8
addons:
apt:
- sources:
- - llvm-toolchain-precise-3.8
- - ubuntu-toolchain-r-test
+ sources: ["llvm-toolchain-precise-3.8", "ubuntu-toolchain-r-test"]
packages: clang-3.8
- env:
- - CXX=clang++-3.8
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
- - BUILD_WITH_ASAN=yes
- os: linux
- dist: trusty
+ env: COMPILER=clang++-3.9 DISABLE_ASAN=yes
addons:
apt:
- sources:
- - llvm-toolchain-trusty-3.9
- - ubuntu-toolchain-r-test
+ sources: ["llvm-toolchain-trusty-3.9", "ubuntu-toolchain-r-test"]
packages: clang-3.9
- env:
- - CXX=clang++-3.9
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
- os: linux
- dist: trusty
+ env: COMPILER=clang++-4.0
addons:
apt:
- sources:
- - llvm-toolchain-trusty-4.0
- - ubuntu-toolchain-r-test
+ sources: ["llvm-toolchain-trusty-4.0", "ubuntu-toolchain-r-test"]
packages: clang-4.0
- env:
- - CXX=clang++-4.0
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
- - BUILD_WITH_ASAN=yes
- os: linux
- dist: trusty
+ env: COMPILER=clang++-5.0
addons:
apt:
- sources:
- - llvm-toolchain-trusty-5.0
- - ubuntu-toolchain-r-test
+ sources: ["llvm-toolchain-trusty-5.0", "ubuntu-toolchain-r-test"]
packages: clang-5.0
- env:
- - CXX=clang++-5.0
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
- - BUILD_WITH_ASAN=yes
+ - os: linux
+ env: COMPILER=clang++-6.0
+ addons:
+ apt:
+ sources: ["llvm-toolchain-trusty-6.0", "ubuntu-toolchain-r-test"]
+ packages: clang-6.0
# macOS/clang
- # https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version
+ # https://docs.travis-ci.com/user/reference/osx/#OS-X-Version
- os: osx
osx_image: xcode7.3
- env:
- - NODE_LABELS="OSX OSX-10.11"
- - BUILD_WITH_ASAN=yes
+ env: OSX_VERSION=10.11
- os: osx
osx_image: xcode8.3
- env:
- - NODE_LABELS="OSX OSX-10.12"
- - BUILD_WITH_ASAN=yes
+ env: OSX_VERSION=10.12
- os: osx
- osx_image: xcode9
- env:
- - NODE_LABELS="OSX OSX-10.12"
- - BUILD_WITH_ASAN=yes
+ osx_image: xcode9.2
+ env: OSX_VERSION=10.12
+ - os: osx
+ osx_image: xcode9.3beta
+ env: OSX_VERSION=10.13
before_script:
+ - if [[ ${TRAVIS_OS_NAME} == linux ]]; then export NODE_LABELS="Linux Ubuntu Ubuntu-14.04"; fi
+ - if [[ ${TRAVIS_OS_NAME} == osx ]]; then export NODE_LABELS="OSX OSX-${OSX_VERSION}"; fi
+ - if [[ -n ${COMPILER} ]]; then export CXX=${COMPILER}; fi
- ${CXX:-c++} --version
- python --version
diff --git a/tests/unit/repo-command-parameter.cpp b/tests/unit/repo-command-parameter.cpp
index 3c5efcf..3e35169 100644
--- a/tests/unit/repo-command-parameter.cpp
+++ b/tests/unit/repo-command-parameter.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014, Regents of the University of California.
+/*
+ * Copyright (c) 2014-2018, Regents of the University of California.
*
* This file is part of NDN repo-ng (Next generation of NDN repository).
* See AUTHORS.md for complete list of repo-ng authors and contributors.
@@ -43,7 +43,7 @@
// These octets are obtained by the snippet below.
// This check is intended to detect unexpected encoding change in the future.
- //for (ndn::Buffer::const_iterator it = wire.begin(); it != wire.end(); ++it) {
+ //for (auto it = wire.begin(); it != wire.end(); ++it) {
// printf("0x%02x, ", *it);
//}
static const uint8_t expected[] = {
@@ -55,10 +55,7 @@
BOOST_REQUIRE_EQUAL_COLLECTIONS(expected, expected + sizeof(expected),
wire.begin(), wire.end());
- BOOST_REQUIRE_NO_THROW(repo::RepoCommandParameter(wire));
-
repo::RepoCommandParameter decoded(wire);
- //std::cout << decoded << std::endl;
BOOST_CHECK_EQUAL(decoded.getName(), parameter.getName());
BOOST_CHECK_EQUAL(decoded.getStartBlockId(), parameter.getStartBlockId());
BOOST_CHECK_EQUAL(decoded.getEndBlockId(), parameter.getEndBlockId());
diff --git a/tests/unit/repo-command-response.cpp b/tests/unit/repo-command-response.cpp
index 6192473..ab03207 100644
--- a/tests/unit/repo-command-response.cpp
+++ b/tests/unit/repo-command-response.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014, Regents of the University of California.
+/*
+ * Copyright (c) 2014-2018, Regents of the University of California.
*
* This file is part of NDN repo-ng (Next generation of NDN repository).
* See AUTHORS.md for complete list of repo-ng authors and contributors.
@@ -40,7 +40,7 @@
// These octets are obtained by the snippet below.
// This check is intended to detect unexpected encoding change in the future.
- //for (ndn::Buffer::const_iterator it = wire.begin(); it != wire.end(); ++it) {
+ //for (auto it = wire.begin(); it != wire.end(); ++it) {
// printf("0x%02x, ", *it);
//}
static const uint8_t expected[] = {
@@ -52,8 +52,6 @@
BOOST_REQUIRE_EQUAL_COLLECTIONS(expected, expected + sizeof(expected),
wire.begin(), wire.end());
- BOOST_REQUIRE_NO_THROW(repo::RepoCommandResponse(wire));
-
repo::RepoCommandResponse decoded(wire);
BOOST_CHECK_EQUAL(decoded.getStatusCode(), response.getStatusCode());
BOOST_CHECK_EQUAL(decoded.getStartBlockId(), response.getStartBlockId());