Repository: arrow Updated Branches: refs/heads/master 28553b4f1 -> 75d1f613c
http://git-wip-us.apache.org/repos/asf/arrow/blob/75d1f613/cpp/build-support/iwyu/mappings/boost-extra.imp ---------------------------------------------------------------------- diff --git a/cpp/build-support/iwyu/mappings/boost-extra.imp b/cpp/build-support/iwyu/mappings/boost-extra.imp new file mode 100644 index 0000000..aba1e41 --- /dev/null +++ b/cpp/build-support/iwyu/mappings/boost-extra.imp @@ -0,0 +1,23 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +[ + { include: ["<boost/core/explicit_operator_bool.hpp>", private, "<boost/optional/optional.hpp>", public ] }, + { include: ["<boost/cstdint.hpp>", private, "<cstdint>", public ] }, + { include: ["<boost/none.hpp>", private, "<boost/optional/optional.hpp>", public ] }, + { include: ["<boost/optional/detail/optional_relops.hpp>", private, "<boost/optional/optional.hpp>", public ] }, + { include: ["<boost/optional/detail/optional_reference_spec.hpp>", private, "<boost/optional/optional.hpp>", public ] } +] http://git-wip-us.apache.org/repos/asf/arrow/blob/75d1f613/cpp/build-support/iwyu/mappings/gflags.imp ---------------------------------------------------------------------- diff --git a/cpp/build-support/iwyu/mappings/gflags.imp b/cpp/build-support/iwyu/mappings/gflags.imp new file mode 100644 index 0000000..46ce63d --- /dev/null +++ b/cpp/build-support/iwyu/mappings/gflags.imp @@ -0,0 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +[ + # <gflags/gflags_declare.h> confuses the IWYU tool because of the 'using ' + { symbol: [ "fLS::clstring", private, "<string>", public ] } +] http://git-wip-us.apache.org/repos/asf/arrow/blob/75d1f613/cpp/build-support/iwyu/mappings/glog.imp ---------------------------------------------------------------------- diff --git a/cpp/build-support/iwyu/mappings/glog.imp b/cpp/build-support/iwyu/mappings/glog.imp new file mode 100644 index 0000000..08c5e35 --- /dev/null +++ b/cpp/build-support/iwyu/mappings/glog.imp @@ -0,0 +1,27 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +[ + { symbol: [ "LOG", private, "<glog/logging.h>", public ] }, + { symbol: [ "VLOG", private, "<glog/logging.h>", public ] }, + { symbol: [ "CHECK_EQ", private, "<glog/logging.h>", public ] }, + { symbol: [ "CHECK_NE", private, "<glog/logging.h>", public ] }, + { symbol: [ "CHECK_LT", private, "<glog/logging.h>", public ] }, + { symbol: [ "CHECK_GE", private, "<glog/logging.h>", public ] }, + { symbol: [ "CHECK_GT", private, "<glog/logging.h>", public ] }, + { symbol: [ "ErrnoLogMessage", private, "<glog/logging.h>", public ] }, + { symbol: [ "COMPACT_GOOGLE_LOG_0", private, "<glog/logging.h>", public ] } +] http://git-wip-us.apache.org/repos/asf/arrow/blob/75d1f613/cpp/build-support/iwyu/mappings/gtest.imp ---------------------------------------------------------------------- diff --git a/cpp/build-support/iwyu/mappings/gtest.imp b/cpp/build-support/iwyu/mappings/gtest.imp new file mode 100644 index 0000000..a541650 --- /dev/null +++ b/cpp/build-support/iwyu/mappings/gtest.imp @@ -0,0 +1,26 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +[ + { include: [ "<gtest/internal/gtest-internal.h>", private, "<gtest/gtest.h>", public ] }, + { include: [ "<gtest/internal/gtest-string.h>", private, "<gtest/gtest.h>", public ] }, + { include: [ "<gtest/gtest-death-test.h>", private, "<gtest/gtest.h>", public ] }, + { include: [ "<gtest/gtest-message.h>", private, "<gtest/gtest.h>", public ] }, + { include: [ "<gtest/gtest-param-test.h>", private, "<gtest/gtest.h>", public ] }, + { include: [ "<gtest/gtest-printers.h>", private, "<gtest/gtest.h>", public ] }, + { include: [ "<gtest/gtest-test-part.h>", private, "<gtest/gtest.h>", public ] }, + { include: [ "<gtest/gtest-typed-test.h>", private, "<gtest/gtest.h>", public ] } +] http://git-wip-us.apache.org/repos/asf/arrow/blob/75d1f613/cpp/src/arrow/builder.cc ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/builder.cc b/cpp/src/arrow/builder.cc index 5dba0e1..daaf49c 100644 --- a/cpp/src/arrow/builder.cc +++ b/cpp/src/arrow/builder.cc @@ -158,6 +158,7 @@ void ArrayBuilder::UnsafeSetNotNull(int64_t length) { // Fill up the bytes until we have a byte alignment int64_t pad_to_byte = std::min<int64_t>(8 - (length_ % 8), length); + if (pad_to_byte == 8) { pad_to_byte = 0; } http://git-wip-us.apache.org/repos/asf/arrow/blob/75d1f613/dev/release/rat_exclude_files.txt ---------------------------------------------------------------------- diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt index 1a34613..15a3893 100644 --- a/dev/release/rat_exclude_files.txt +++ b/dev/release/rat_exclude_files.txt @@ -8,6 +8,7 @@ cpp/src/arrow/status.h cpp/build-support/asan_symbolize.py cpp/build-support/cpplint.py cpp/build-support/clang_format_exclusions.txt +cpp/build-support/iwyu/* cpp/cmake_modules/BuildUtils.cmake cpp/cmake_modules/FindPythonLibsNew.cmake cpp/cmake_modules/FindNumPy.cmake
