Skip to content

Commit 9bed44e

Browse files
committed
rename methods to comply with modern style
1 parent 8fefed4 commit 9bed44e

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

llvm/include/llvm/ADT/SmallPtrSet.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -248,16 +248,16 @@ class SmallPtrSetImplBase : public DebugEpochBase {
248248
void swap(const void **SmallStorage, const void **RHSSmallStorage,
249249
SmallPtrSetImplBase &RHS);
250250

251-
void CopyFrom(const void **SmallStorage, const SmallPtrSetImplBase &RHS);
252-
void MoveFrom(const void **SmallStorage, unsigned SmallSize,
251+
void copyFrom(const void **SmallStorage, const SmallPtrSetImplBase &RHS);
252+
void moveFrom(const void **SmallStorage, unsigned SmallSize,
253253
const void **RHSSmallStorage, SmallPtrSetImplBase &&RHS);
254254

255255
private:
256-
/// Code shared by MoveFrom() and move constructor.
257-
void MoveHelper(const void **SmallStorage, unsigned SmallSize,
256+
/// Code shared by moveFrom() and move constructor.
257+
void moveHelper(const void **SmallStorage, unsigned SmallSize,
258258
const void **RHSSmallStorage, SmallPtrSetImplBase &&RHS);
259-
/// Code shared by CopyFrom() and copy constructor.
260-
void CopyHelper(const SmallPtrSetImplBase &RHS);
259+
/// Code shared by copyFrom() and copy constructor.
260+
void copyHelper(const SmallPtrSetImplBase &RHS);
261261
};
262262

263263
/// SmallPtrSetIteratorImpl - This is the common base class shared between all
@@ -559,14 +559,14 @@ class SmallPtrSet : public SmallPtrSetImpl<PtrType> {
559559
SmallPtrSet<PtrType, SmallSize> &
560560
operator=(const SmallPtrSet<PtrType, SmallSize> &RHS) {
561561
if (&RHS != this)
562-
this->CopyFrom(SmallStorage, RHS);
562+
this->copyFrom(SmallStorage, RHS);
563563
return *this;
564564
}
565565

566566
SmallPtrSet<PtrType, SmallSize> &
567567
operator=(SmallPtrSet<PtrType, SmallSize> &&RHS) {
568568
if (&RHS != this)
569-
this->MoveFrom(SmallStorage, SmallSizePowTwo, RHS.SmallStorage,
569+
this->moveFrom(SmallStorage, SmallSizePowTwo, RHS.SmallStorage,
570570
std::move(RHS));
571571
return *this;
572572
}

llvm/lib/Support/SmallPtrSet.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,17 @@ SmallPtrSetImplBase::SmallPtrSetImplBase(const void **SmallStorage,
149149
}
150150

151151
// Copy over the that array.
152-
CopyHelper(that);
152+
copyHelper(that);
153153
}
154154

155155
SmallPtrSetImplBase::SmallPtrSetImplBase(const void **SmallStorage,
156156
unsigned SmallSize,
157157
const void **RHSSmallStorage,
158158
SmallPtrSetImplBase &&that) {
159-
MoveHelper(SmallStorage, SmallSize, RHSSmallStorage, std::move(that));
159+
moveHelper(SmallStorage, SmallSize, RHSSmallStorage, std::move(that));
160160
}
161161

162-
void SmallPtrSetImplBase::CopyFrom(const void **SmallStorage,
162+
void SmallPtrSetImplBase::copyFrom(const void **SmallStorage,
163163
const SmallPtrSetImplBase &RHS) {
164164
assert(&RHS != this && "Self-copy should be handled by the caller.");
165165

@@ -185,10 +185,10 @@ void SmallPtrSetImplBase::CopyFrom(const void **SmallStorage,
185185
IsSmall = false;
186186
}
187187

188-
CopyHelper(RHS);
188+
copyHelper(RHS);
189189
}
190190

191-
void SmallPtrSetImplBase::CopyHelper(const SmallPtrSetImplBase &RHS) {
191+
void SmallPtrSetImplBase::copyHelper(const SmallPtrSetImplBase &RHS) {
192192
// Copy over the new array size
193193
CurArraySize = RHS.CurArraySize;
194194

@@ -199,16 +199,16 @@ void SmallPtrSetImplBase::CopyHelper(const SmallPtrSetImplBase &RHS) {
199199
NumTombstones = RHS.NumTombstones;
200200
}
201201

202-
void SmallPtrSetImplBase::MoveFrom(const void **SmallStorage,
202+
void SmallPtrSetImplBase::moveFrom(const void **SmallStorage,
203203
unsigned SmallSize,
204204
const void **RHSSmallStorage,
205205
SmallPtrSetImplBase &&RHS) {
206206
if (!isSmall())
207207
free(CurArray);
208-
MoveHelper(SmallStorage, SmallSize, RHSSmallStorage, std::move(RHS));
208+
moveHelper(SmallStorage, SmallSize, RHSSmallStorage, std::move(RHS));
209209
}
210210

211-
void SmallPtrSetImplBase::MoveHelper(const void **SmallStorage,
211+
void SmallPtrSetImplBase::moveHelper(const void **SmallStorage,
212212
unsigned SmallSize,
213213
const void **RHSSmallStorage,
214214
SmallPtrSetImplBase &&RHS) {

0 commit comments

Comments
 (0)