Skip to content

Commit be35565

Browse files
committed
pass check
1 parent 5e41c64 commit be35565

File tree

5 files changed

+32
-4
lines changed

5 files changed

+32
-4
lines changed

.Rbuildignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
^bootstrap\.R$
55
^LICENSE\.md$
66
^vendor-geoarrow\.sh$
7+
^\.clang-format$
8+
^\.github$

.clang-format

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
---
18+
BasedOnStyle: Google
19+
ColumnLimit: 90
20+
DerivePointerAlignment: false
21+
IncludeBlocks: Preserve

man/geoarrow-package.Rd

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/geoarrow.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "geoarrow.h"
2-
#pragma GCC diagnostic push
3-
#pragma GCC diagnostic ignored "-Wunused-function"
2+
/*ignore*/#pragma GCC diagnostic push
3+
/*ignore*/#pragma GCC diagnostic ignored "-Wunused-function"
44
// Licensed to the Apache Software Foundation (ASF) under one
55
// or more contributor license agreements. See the NOTICE file
66
// distributed with this work for additional information
@@ -3494,7 +3494,7 @@ static inline void ArrowArrayViewGetDecimalUnsafe(const struct ArrowArrayView* a
34943494
#endif
34953495

34963496
#endif
3497-
#pragma GCC diagnostic push
3497+
/*ignore*/#pragma GCC diagnostic push
34983498
#include <errno.h>
34993499
#include <string.h>
35003500

vendor-geoarrow.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ cmake --build .
2020
cmake --install . --prefix=../src
2121
popd
2222

23+
# Mangle -Wunused pragmas since they are there for a good reason
24+
sed -i.bak -e "s|#pragma|/*ignore*/#pragma|" src/geoarrow.c
25+
rm src/geoarrow.c.bak
26+
2327
rm geoarrow.zip
2428
rm -rf geoarrow-c-*
2529
rm -rf geoarrow-cmake

0 commit comments

Comments
 (0)