Skip to content

Commit bd554ba

Browse files
authored
Merge pull request #76883 from nickolas-pohilets/mpokhylets/move-task-locals-header
2 parents 73509ca + cb4c880 commit bd554ba

File tree

7 files changed

+4
-4
lines changed

7 files changed

+4
-4
lines changed

include/swift/ABI/Executor.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class AsyncTask;
2828
class DefaultActor;
2929
class Job;
3030
class SerialExecutorWitnessTable;
31+
struct SwiftError;
3132
class TaskExecutorWitnessTable;
3233

3334
/// An unmanaged reference to a serial executor.

include/swift/ABI/Task.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#ifndef SWIFT_ABI_TASK_H
1818
#define SWIFT_ABI_TASK_H
1919

20-
#include "swift/ABI/TaskLocal.h"
2120
#include "swift/ABI/Executor.h"
2221
#include "swift/ABI/HeapObject.h"
2322
#include "swift/ABI/Metadata.h"

include/swift/ABI/TaskOptions.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#ifndef SWIFT_ABI_TASK_OPTIONS_H
1818
#define SWIFT_ABI_TASK_OPTIONS_H
1919

20-
#include "swift/ABI/TaskLocal.h"
2120
#include "swift/ABI/Executor.h"
2221
#include "swift/ABI/HeapObject.h"
2322
#include "swift/ABI/Metadata.h"

stdlib/public/Concurrency/Task.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
#include "Debug.h"
2525
#include "Error.h"
2626
#include "TaskGroupPrivate.h"
27+
#include "TaskLocal.h"
2728
#include "TaskPrivate.h"
2829
#include "Tracing.h"
2930
#include "swift/ABI/Metadata.h"
3031
#include "swift/ABI/Task.h"
31-
#include "swift/ABI/TaskLocal.h"
3232
#include "swift/ABI/TaskOptions.h"
3333
#include "swift/Basic/Lazy.h"
3434
#include "swift/Runtime/Concurrency.h"

stdlib/public/Concurrency/TaskLocal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#include "swift/ABI/TaskLocal.h"
13+
#include "TaskLocal.h"
1414
#include "../CompatibilityOverride/CompatibilityOverride.h"
1515
#include "TaskPrivate.h"
1616
#include "swift/ABI/Actor.h"
File renamed without changes.

stdlib/public/Concurrency/TaskPrivate.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define SWIFT_CONCURRENCY_TASKPRIVATE_H
1919

2020
#include "Error.h"
21+
#include "TaskLocal.h"
2122
#include "Tracing.h"
2223
#include "swift/ABI/Metadata.h"
2324
#include "swift/ABI/Task.h"

0 commit comments

Comments
 (0)