diff options
| -rw-r--r-- | include/llvm/ADT/Optional.h | 6 | ||||
| -rw-r--r-- | unittests/ADT/OptionalTest.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/llvm/ADT/Optional.h b/include/llvm/ADT/Optional.h index cc6065c062..e55ad797c2 100644 --- a/include/llvm/ADT/Optional.h +++ b/include/llvm/ADT/Optional.h @@ -62,13 +62,13 @@ public: Optional &operator=(const Optional &O) { if (!O) - Reset(); + reset(); else *this = *O; return *this; } - void Reset() { + void reset() { if (hasVal) { (*this)->~T(); hasVal = false; @@ -76,7 +76,7 @@ public: } ~Optional() { - Reset(); + reset(); } const T* getPointer() const { assert(hasVal); return reinterpret_cast<const T*>(storage.buffer); } diff --git a/unittests/ADT/OptionalTest.cpp b/unittests/ADT/OptionalTest.cpp index 8bdea45c5a..6fd8bbaf09 100644 --- a/unittests/ADT/OptionalTest.cpp +++ b/unittests/ADT/OptionalTest.cpp @@ -56,7 +56,7 @@ TEST_F(OptionalTest, ResetTest) { EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments); EXPECT_EQ(1u, NonDefaultConstructible::Destructions); NonDefaultConstructible::ResetCounts(); - O.Reset(); + O.reset(); EXPECT_EQ(0u, NonDefaultConstructible::CopyConstructions); EXPECT_EQ(0u, NonDefaultConstructible::CopyAssignments); EXPECT_EQ(1u, NonDefaultConstructible::Destructions); |