Skip to content

Commit 63cfcfe

Browse files
authored
Merge branch 'main' into issue-2123-improve-java-build-robustness
2 parents 38fda42 + 0a093f7 commit 63cfcfe

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

cpp/.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ BreakConstructorInitializers: BeforeColon
5656
BreakInheritanceList: BeforeColon
5757
BreakStringLiterals: true
5858
ColumnLimit: 100
59-
CommentPragmas: '^ ?[*]? ?(IWYU pragma:|SPDX-)'
59+
CommentPragmas: '(IWYU pragma:|SPDX-)'
6060
CompactNamespaces: false
6161
ConstructorInitializerAllOnOneLineOrOnePerLine: true
6262
# Kept the below 2 to be the same as `IndentWidth` to keep everything uniform

cpp/src/neighbors/detail/cagra/cagra_build.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* SPDX-FileCopyrightText: Copyright (c) 2023-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3-
* reserved. SPDX-License-Identifier: Apache-2.0
3+
* SPDX-License-Identifier: Apache-2.0
44
*/
55
#pragma once
66

cpp/src/neighbors/detail/cagra/cagra_filter_payload.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights
3-
* reserved. SPDX-License-Identifier: Apache-2.0
2+
* SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
* SPDX-License-Identifier: Apache-2.0
44
*/
55
#pragma once
66

cpp/src/neighbors/detail/cagra/jit_lto_kernels/cagra_filter_payload.cuh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights
3-
* reserved. SPDX-License-Identifier: Apache-2.0
2+
* SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
* SPDX-License-Identifier: Apache-2.0
44
*/
55
#pragma once
66

0 commit comments

Comments
 (0)