Rename llvm::Optional<T>::Reset to 'reset' as per LLVM naming conventions.
authorDavid Blaikie <dblaikie@gmail.com>
Wed, 20 Feb 2013 06:25:36 +0000 (06:25 +0000)
committerDavid Blaikie <dblaikie@gmail.com>
Wed, 20 Feb 2013 06:25:36 +0000 (06:25 +0000)
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

include/llvm/ADT/Optional.h
unittests/ADT/OptionalTest.cpp

index cc6065c062a2f9e6f76307f5cd15f5ab610a3c27..e55ad797c2cba3270327f01f3ea03606bb6c79ca 100644 (file)
@@ -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); }
index 8bdea45c5a93de63947c1d6b51e723a2abe50740..6fd8bbaf0961087b61a4f2410654c81cd89e9df2 100644 (file)
@@ -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);