Skip to content

Commit

Permalink
upgrade to precise to verify if build works. address self comments
Browse files Browse the repository at this point in the history
  • Loading branch information
emkornfield committed Apr 1, 2016
1 parent d3f76d8 commit e7723d1
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sudo: required
dist: trusty
dist: precise
addons:
apt:
sources:
Expand Down
2 changes: 1 addition & 1 deletion ci/travis_script_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pushd $CPP_BUILD_DIR
make lint
if [ $TRAVIS_OS_NAME == "linux" ]; then
make check-format
make clang-tidy
make check-clang-tidy
fi

ctest -L unittest
Expand Down
12 changes: 12 additions & 0 deletions cpp/build-support/run-clang-format.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
#!/bin/bash
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Runs clang format in the given directory
# Arguments:
# $1 - Path to the source tree
Expand Down
15 changes: 14 additions & 1 deletion cpp/build-support/run-clang-tidy.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
#!/bin/bash
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#
# Runs clang format in the given directory
# Arguments:
# $1 - Path to the clang tidy binary
# $2 - Path to the compile_commands.json to use
# $3 - Apply fixes (will raise an error if false and not there where changes)
# $ARGN - Files to run clang format on
# $ARGN - Files to run clang-tidy on
#
CLANG_TIDY=$1
shift
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/logging.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class CerrLog {
// return so we create a new class to give it a hint.
class FatalLog : public CerrLog {
public:
FatalLog(int /* severity */) // NOLINT(runtime/explicit)
FatalLog(int /* severity */) // NOLINT
: CerrLog(ARROW_FATAL) {}

[[noreturn]] ~FatalLog() {
Expand Down

0 comments on commit e7723d1

Please sign in to comment.