Skip to content

Commit 1d8bf9d

Browse files
author
git apple-llvm automerger
committed
Merge commit 'aee4d346f0ad' from swift/release/6.1 into stable/20240723
2 parents d53ecfc + aee4d34 commit 1d8bf9d

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

lldb/include/lldb/API/LLDB.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
#include "lldb/API/SBProcess.h"
5555
#include "lldb/API/SBProcessInfo.h"
5656
#include "lldb/API/SBProcessInfoList.h"
57+
#include "lldb/API/SBProgress.h"
5758
#include "lldb/API/SBQueue.h"
5859
#include "lldb/API/SBQueueItem.h"
5960
#include "lldb/API/SBReproducer.h"

lldb/include/lldb/API/SBDefines.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ class LLDB_API SBPlatformShellCommand;
9595
class LLDB_API SBProcess;
9696
class LLDB_API SBProcessInfo;
9797
class LLDB_API SBProcessInfoList;
98+
class LLDB_API SBProgress;
9899
class LLDB_API SBQueue;
99100
class LLDB_API SBQueueItem;
100101
class LLDB_API SBReplayOptions;

lldb/include/lldb/API/SBProgress.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ class LLDB_API SBProgress {
5151
SBProgress(const char *title, const char *details, uint64_t total_units,
5252
SBDebugger &debugger);
5353

54+
#ifndef SWIG
55+
SBProgress(SBProgress &&rhs);
56+
#endif
57+
5458
~SBProgress();
5559

5660
void Increment(uint64_t amount, const char *description = nullptr);
@@ -59,6 +63,9 @@ class LLDB_API SBProgress {
5963
lldb_private::Progress &ref() const;
6064

6165
private:
66+
SBProgress(const SBProgress &rhs) = delete;
67+
const SBProgress &operator=(const SBProgress &rhs) = delete;
68+
6269
std::unique_ptr<lldb_private::Progress> m_opaque_up;
6370
}; // SBProgress
6471
} // namespace lldb

lldb/source/API/SBProgress.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ SBProgress::SBProgress(const char *title, const char *details,
3232
lldb_private::Progress::Origin::eExternal);
3333
}
3434

35+
SBProgress::SBProgress(SBProgress &&rhs)
36+
: m_opaque_up(std::move(rhs.m_opaque_up)) {}
37+
3538
SBProgress::~SBProgress() = default;
3639

3740
void SBProgress::Increment(uint64_t amount, const char *description) {

0 commit comments

Comments
 (0)