Skip to content

Commit 0861af0

Browse files
committed
use LLVM_ABI_FRIEND for friend fucntion decl annotations
1 parent 09aabef commit 0861af0

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

llvm/include/llvm/Support/Error.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1182,7 +1182,7 @@ class ExpectedAsOutParameter {
11821182
/// (or Expected) and you want to call code that still returns
11831183
/// std::error_codes.
11841184
class ECError : public ErrorInfo<ECError> {
1185-
LLVM_ABI friend Error errorCodeToError(std::error_code);
1185+
LLVM_ABI_FRIEND friend Error errorCodeToError(std::error_code);
11861186

11871187
LLVM_ABI void anchor() override;
11881188

llvm/include/llvm/Support/FileSystem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class basic_file_status {
220220

221221
/// Represents the result of a call to sys::fs::status().
222222
class file_status : public basic_file_status {
223-
LLVM_ABI friend bool equivalent(file_status A, file_status B);
223+
LLVM_ABI_FRIEND friend bool equivalent(file_status A, file_status B);
224224

225225
#if defined(LLVM_ON_UNIX)
226226
dev_t fs_st_dev = 0;

llvm/include/llvm/Support/JSON.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ class Value {
531531
llvm::StringRef, std::string, json::Array,
532532
json::Object>
533533
Union;
534-
LLVM_ABI friend bool operator==(const Value &, const Value &);
534+
LLVM_ABI_FRIEND friend bool operator==(const Value &, const Value &);
535535
};
536536

537537
LLVM_ABI bool operator==(const Value &, const Value &);
@@ -713,7 +713,7 @@ class Path::Root {
713713
llvm::StringLiteral ErrorMessage;
714714
std::vector<Path::Segment> ErrorPath; // Only valid in error state. Reversed.
715715

716-
LLVM_ABI friend void Path::report(llvm::StringLiteral Message);
716+
LLVM_ABI_FRIEND friend void Path::report(llvm::StringLiteral Message);
717717

718718
public:
719719
Root(llvm::StringRef Name = "") : Name(Name), ErrorMessage("") {}

llvm/include/llvm/Support/Path.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ class const_iterator
8080
Style S = Style::native; ///< The path style to use.
8181

8282
// An end iterator has Position = Path.size() + 1.
83-
LLVM_ABI friend const_iterator begin(StringRef path, Style style);
84-
LLVM_ABI friend const_iterator end(StringRef path);
83+
LLVM_ABI_FRIEND friend const_iterator begin(StringRef path, Style style);
84+
LLVM_ABI_FRIEND friend const_iterator end(StringRef path);
8585

8686
public:
8787
reference operator*() const { return Component; }
@@ -105,8 +105,8 @@ class reverse_iterator
105105
size_t Position = 0; ///< The iterators current position within Path.
106106
Style S = Style::native; ///< The path style to use.
107107

108-
LLVM_ABI friend reverse_iterator rbegin(StringRef path, Style style);
109-
LLVM_ABI friend reverse_iterator rend(StringRef path);
108+
LLVM_ABI_FRIEND friend reverse_iterator rbegin(StringRef path, Style style);
109+
LLVM_ABI_FRIEND friend reverse_iterator rend(StringRef path);
110110

111111
public:
112112
reference operator*() const { return Component; }

llvm/include/llvm/Support/PrettyStackTrace.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ namespace llvm {
5151
/// constructed and destructed, they will add their symbolic frames to a
5252
/// virtual stack trace. This gets dumped out if the program crashes.
5353
class LLVM_ABI PrettyStackTraceEntry {
54-
LLVM_ABI friend PrettyStackTraceEntry *
54+
LLVM_ABI_FRIEND friend PrettyStackTraceEntry *
5555
ReverseStackTrace(PrettyStackTraceEntry *);
5656

5757
PrettyStackTraceEntry *NextEntry;

llvm/include/llvm/Support/Timer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ class TimerGroup {
257257

258258
private:
259259
friend class Timer;
260-
LLVM_ABI friend void PrintStatisticsJSON(raw_ostream &OS);
260+
LLVM_ABI_FRIEND friend void PrintStatisticsJSON(raw_ostream &OS);
261261
void addTimer(Timer &T);
262262
void removeTimer(Timer &T);
263263
void prepareToPrintList(bool reset_time = false);

0 commit comments

Comments
 (0)