6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

Rename llvm::Optional<T>::Reset to 'reset' as per LLVM naming conventions.

Browse Source 
Code review feedback on r175580 from Jordan Rose.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175595 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie
2013-02-20 06:25:36 +00:00
parent 65692c809e
commit 4318fc5e1e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/llvm/ADT/Optional.h
View File

@@ -62,13 +62,13 @@ public:
Optional &operator=(const Optional &O) { Optional &operator=(const Optional &O) {
if (!O) if (!O)
Reset(); reset();
else else
*this = *O; *this = *O;
return *this; return *this;
} }
void Reset() { void reset() {
if (hasVal) { if (hasVal) {
(*this)->~T(); (*this)->~T();
hasVal = false; hasVal = false;
@@ -76,7 +76,7 @@ public:
} }
~Optional() { ~Optional() {
Reset(); reset();
} }
const T* getPointer() const { assert(hasVal); return reinterpret_cast<const T*>(storage.buffer); } const T* getPointer() const { assert(hasVal); return reinterpret_cast<const T*>(storage.buffer); }

2
unittests/ADT/OptionalTest.cpp
View File

@@ -56,7 +56,7 @@ TEST_F(OptionalTest, ResetTest) {
EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments); EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
EXPECT_EQ(1u, NonDefaultConstructible::Destructions); EXPECT_EQ(1u, NonDefaultConstructible::Destructions);
NonDefaultConstructible::ResetCounts(); NonDefaultConstructible::ResetCounts();
O.Reset(); O.reset();
EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions); EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions);
EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments); EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments);
EXPECT_EQ(1u, NonDefaultConstructible::Destructions); EXPECT_EQ(1u, NonDefaultConstructible::Destructions);