Skip to content

Commit d1a4cd6

Browse files
committed
Avoid sibling includes
1 parent a4d2f58 commit d1a4cd6

File tree

121 files changed

+248
-245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+248
-245
lines changed

flang-rt/include/flang-rt/array-constructor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#ifndef FLANG_RT_ARRAY_CONSTRUCTOR_H_
1313
#define FLANG_RT_ARRAY_CONSTRUCTOR_H_
1414

15-
#include "flang-rt/descriptor.h"
15+
#include "descriptor.h"
1616
#include "flang/Runtime/array-constructor-consts.h"
1717
#include "flang/Runtime/entry-names.h"
1818
#include <cstdint>

flang-rt/lib/flang_rt/assign-impl.h renamed to flang-rt/include/flang-rt/assign-impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/assign-impl.h ------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/assign-impl.h --------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/lib/flang_rt/buffer.h renamed to flang-rt/include/flang-rt/buffer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/buffer.h -----------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/buffer.h -------------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -12,7 +12,7 @@
1212
#define FLANG_RT_BUFFER_H_
1313

1414
#include "io-error.h"
15-
#include "flang-rt/memory.h"
15+
#include "memory.h"
1616
#include "flang/Runtime/freestanding-tools.h"
1717
#include <algorithm>
1818
#include <cinttypes>

flang-rt/lib/flang_rt/connection.h renamed to flang-rt/include/flang-rt/connection.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/connection.h -------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/connection.h ---------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/lib/flang_rt/derived.h renamed to flang-rt/include/flang-rt/derived.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/derived.h ----------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/derived.h ------------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/include/flang-rt/descriptor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
// User C code is welcome to depend on that ISO_Fortran_binding.h file,
1919
// but should never reference this internal header.
2020

21-
#include "flang-rt/memory.h"
22-
#include "flang-rt/type-code.h"
21+
#include "memory.h"
22+
#include "type-code.h"
2323
#include "flang/Common/ISO_Fortran_binding_wrapper.h"
2424
#include "flang/Runtime/descriptor-consts.h"
2525
#include <algorithm>

flang-rt/lib/flang_rt/emit-encoded.h renamed to flang-rt/include/flang-rt/emit-encoded.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/emit-encoded.h -----------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/emit-encoded.h -------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/lib/flang_rt/environment.h renamed to flang-rt/include/flang-rt/environment.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/environment.h ------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/environment.h --------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/lib/flang_rt/file.h renamed to flang-rt/include/flang-rt/file.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/file.h -------------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/file.h ---------------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -12,7 +12,7 @@
1212
#define FLANG_RT_FILE_H_
1313

1414
#include "io-error.h"
15-
#include "flang-rt/memory.h"
15+
#include "memory.h"
1616
#include "flang/Common/optional.h"
1717
#include <cinttypes>
1818

flang-rt/lib/flang_rt/format-implementation.h renamed to flang-rt/include/flang-rt/format-implementation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/format-implementation.h --------------------*- C++ -*-===//
1+
//===-- include/flang-rt/format-implementation.h ----------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/lib/flang_rt/format.h renamed to flang-rt/include/flang-rt/format.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/format.h -----------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/format.h -------------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/lib/flang_rt/internal-unit.h renamed to flang-rt/include/flang-rt/internal-unit.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/internal-unit.h ----------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/internal-unit.h ------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -12,7 +12,7 @@
1212
#define FLANG_RT_INTERNAL_UNIT_H_
1313

1414
#include "connection.h"
15-
#include "flang-rt/descriptor.h"
15+
#include "descriptor.h"
1616
#include <cinttypes>
1717
#include <type_traits>
1818

flang-rt/lib/flang_rt/io-error.h renamed to flang-rt/include/flang-rt/io-error.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/io-error.h ---------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/io-error.h -----------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -15,8 +15,8 @@
1515
#ifndef FLANG_RT_IO_ERROR_H_
1616
#define FLANG_RT_IO_ERROR_H_
1717

18+
#include "memory.h"
1819
#include "terminator.h"
19-
#include "flang-rt/memory.h"
2020
#include "flang/Runtime/iostat.h"
2121
#include <cinttypes>
2222

flang-rt/lib/flang_rt/io-stmt.h renamed to flang-rt/include/flang-rt/io-stmt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/io-stmt.h ----------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/io-stmt.h ------------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -12,11 +12,11 @@
1212
#define FLANG_RT_IO_STMT_H_
1313

1414
#include "connection.h"
15+
#include "descriptor.h"
1516
#include "file.h"
1617
#include "format.h"
1718
#include "internal-unit.h"
1819
#include "io-error.h"
19-
#include "flang-rt/descriptor.h"
2020
#include "flang/Common/optional.h"
2121
#include "flang/Common/reference-wrapper.h"
2222
#include "flang/Common/visit.h"

flang-rt/lib/flang_rt/lock.h renamed to flang-rt/include/flang-rt/lock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/lock.h -------------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/lock.h ---------------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/lib/flang_rt/namelist.h renamed to flang-rt/include/flang-rt/namelist.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/namelist.h ---------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/namelist.h -----------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/lib/flang_rt/non-tbp-dio.h renamed to flang-rt/include/flang-rt/non-tbp-dio.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/non-tbp-dio.h ------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/non-tbp-dio.h --------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/lib/flang_rt/numeric-templates.h renamed to flang-rt/include/flang-rt/numeric-templates.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/numeric-templates.h ------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/numeric-templates.h --------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/lib/flang_rt/random-templates.h renamed to flang-rt/include/flang-rt/random-templates.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/random-templates.h -------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/random-templates.h ---------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -9,9 +9,9 @@
99
#ifndef FLANG_RT_RANDOM_TEMPLATES_H_
1010
#define FLANG_RT_RANDOM_TEMPLATES_H_
1111

12+
#include "descriptor.h"
1213
#include "lock.h"
1314
#include "numeric-templates.h"
14-
#include "flang-rt/descriptor.h"
1515
#include "flang/Common/optional.h"
1616
#include <algorithm>
1717
#include <random>

flang-rt/lib/flang_rt/reduction-templates.h renamed to flang-rt/include/flang-rt/reduction-templates.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/reduction-templates.h ----------------------*- C++ -*-===//
1+
//===-- include/flang-rt/reduction-templates.h ------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -21,10 +21,10 @@
2121
#ifndef FLANG_RT_REDUCTION_TEMPLATES_H_
2222
#define FLANG_RT_REDUCTION_TEMPLATES_H_
2323

24+
#include "descriptor.h"
2425
#include "numeric-templates.h"
2526
#include "terminator.h"
2627
#include "tools.h"
27-
#include "flang-rt/descriptor.h"
2828
#include "flang/Runtime/cpp-type.h"
2929
#include <algorithm>
3030

flang-rt/lib/flang_rt/stat.h renamed to flang-rt/include/flang-rt/stat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/stat.h -------------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/stat.h ---------------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/lib/flang_rt/terminator.h renamed to flang-rt/include/flang-rt/terminator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/terminator.h -------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/terminator.h ---------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/lib/flang_rt/tools.h renamed to flang-rt/include/flang-rt/tools.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/tools.h ------------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/tools.h --------------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -9,10 +9,10 @@
99
#ifndef FLANG_RT_TOOLS_H_
1010
#define FLANG_RT_TOOLS_H_
1111

12+
#include "descriptor.h"
13+
#include "memory.h"
1214
#include "stat.h"
1315
#include "terminator.h"
14-
#include "flang-rt/descriptor.h"
15-
#include "flang-rt/memory.h"
1616
#include "flang/Common/optional.h"
1717
#include "flang/Runtime/cpp-type.h"
1818
#include "flang/Runtime/freestanding-tools.h"

flang-rt/lib/flang_rt/type-info.h renamed to flang-rt/include/flang-rt/type-info.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/type-info.h --------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/type-info.h ----------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -12,8 +12,8 @@
1212
// A C++ perspective of the derived type description schemata in
1313
// flang/module/__fortran_type_info.f90.
1414

15+
#include "descriptor.h"
1516
#include "terminator.h"
16-
#include "flang-rt/descriptor.h"
1717
#include "flang/Common/Fortran-consts.h"
1818
#include "flang/Common/bit-population-count.h"
1919
#include "flang/Common/optional.h"

flang-rt/lib/flang_rt/utf.h renamed to flang-rt/include/flang-rt/utf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- lib/flang_rt/utf.h --------------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/utf.h ----------------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

flang-rt/lib/FortranFloat128Math/math-entries.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#ifndef FLANG_RT_FORTRANFLOAT128MATH_MATH_ENTRIES_H_
1010
#define FLANG_RT_FORTRANFLOAT128MATH_MATH_ENTRIES_H_
1111

12-
#include "../flang_rt/terminator.h"
13-
#include "../flang_rt/tools.h"
12+
#include "flang-rt/terminator.h"
13+
#include "flang-rt/tools.h"
1414
#include "flang/Common/float128.h"
1515
#include "flang/Runtime/entry-names.h"
1616
#include <cfloat>

flang-rt/lib/FortranFloat128Math/norm2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "math-entries.h"
1010
#include "numeric-template-specs.h"
11-
#include "../flang_rt/reduction-templates.h"
11+
#include "flang-rt/reduction-templates.h"
1212

1313
namespace Fortran::runtime {
1414
extern "C" {

flang-rt/lib/FortranFloat128Math/numeric-template-specs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define FLANG_RT_FORTRANFLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_
1111

1212
#include "math-entries.h"
13-
#include "../flang_rt/numeric-templates.h"
13+
#include "flang-rt/numeric-templates.h"
1414

1515
namespace Fortran::runtime {
1616
using F128Type = CppTypeFor<TypeCategory::Real, 16>;

flang-rt/lib/FortranFloat128Math/random.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "math-entries.h"
1010
#include "numeric-template-specs.h"
11-
#include "../flang_rt/random-templates.h"
11+
#include "flang-rt/random-templates.h"
1212

1313
using namespace Fortran::runtime::random;
1414
extern "C" {

flang-rt/lib/flang_rt/CUDA/allocatable.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang/Runtime/CUDA/allocatable.h"
10-
#include "../assign-impl.h"
11-
#include "../stat.h"
12-
#include "../terminator.h"
10+
#include "flang-rt/assign-impl.h"
1311
#include "flang-rt/descriptor.h"
12+
#include "flang-rt/stat.h"
13+
#include "flang-rt/terminator.h"
1414
#include "flang/Runtime/CUDA/common.h"
1515
#include "flang/Runtime/CUDA/descriptor.h"
1616
#include "flang/Runtime/CUDA/memmove-function.h"

flang-rt/lib/flang_rt/CUDA/allocator.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang-rt/CUDA/allocator.h"
10-
#include "../derived.h"
11-
#include "../stat.h"
12-
#include "../terminator.h"
13-
#include "../type-info.h"
1410
#include "flang-rt/allocator-registry.h"
11+
#include "flang-rt/derived.h"
12+
#include "flang-rt/stat.h"
13+
#include "flang-rt/terminator.h"
14+
#include "flang-rt/type-info.h"
1515
#include "flang/Common/ISO_Fortran_binding_wrapper.h"
1616
#include "flang/Runtime/CUDA/common.h"
1717
#include "flang/Support/Fortran.h"

flang-rt/lib/flang_rt/CUDA/descriptor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang/Runtime/CUDA/descriptor.h"
10-
#include "../terminator.h"
1110
#include "flang-rt/CUDA/allocator.h"
1211
#include "flang-rt/descriptor.h"
12+
#include "flang-rt/terminator.h"
1313
#include "flang/Runtime/CUDA/common.h"
1414

1515
#include "cuda_runtime.h"

flang-rt/lib/flang_rt/CUDA/kernel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang/Runtime/CUDA/kernel.h"
10-
#include "../terminator.h"
10+
#include "flang-rt/terminator.h"
1111
#include "flang/Runtime/CUDA/common.h"
1212

1313
#include "cuda_runtime.h"

flang-rt/lib/flang_rt/CUDA/memmove-function.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang/Runtime/CUDA/memmove-function.h"
10-
#include "../terminator.h"
10+
#include "flang-rt/terminator.h"
1111
#include "flang/Runtime/CUDA/common.h"
1212

1313
#include "cuda_runtime.h"

flang-rt/lib/flang_rt/CUDA/memory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang/Runtime/CUDA/memory.h"
10-
#include "../assign-impl.h"
11-
#include "../terminator.h"
10+
#include "flang-rt/assign-impl.h"
11+
#include "flang-rt/terminator.h"
1212
#include "flang/Runtime/CUDA/common.h"
1313
#include "flang/Runtime/CUDA/descriptor.h"
1414
#include "flang/Runtime/CUDA/memmove-function.h"

flang-rt/lib/flang_rt/CUDA/registration.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang/Runtime/CUDA/registration.h"
10-
#include "../terminator.h"
10+
#include "flang-rt/terminator.h"
1111
#include "flang/Runtime/CUDA/common.h"
1212

1313
#include "cuda_runtime.h"

flang-rt/lib/flang_rt/ISO_Fortran_binding.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// as specified in section 18.5.5 of Fortran 2018.
1111

1212
#include "ISO_Fortran_util.h"
13-
#include "terminator.h"
1413
#include "flang-rt/descriptor.h"
14+
#include "flang-rt/terminator.h"
1515
#include "flang-rt/type-code.h"
1616
#include "flang/Common/ISO_Fortran_binding_wrapper.h"
1717
#include "flang/Runtime/pointer.h"

flang-rt/lib/flang_rt/ISO_Fortran_util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
// Internal utils for establishing CFI_cdesc_t descriptors.
1313

14-
#include "terminator.h"
1514
#include "flang-rt/descriptor.h"
15+
#include "flang-rt/terminator.h"
1616
#include "flang-rt/type-code.h"
1717
#include "flang/Common/ISO_Fortran_binding_wrapper.h"
1818
#include <cstdlib>

0 commit comments

Comments
 (0)