From 4318fc5e1e44f355ae117dcac385f1718d971e90 Mon Sep 17 00:00:00 2001
From: David Blaikie <dblaikie@gmail.com>
Date: Wed, 20 Feb 2013 06:25:36 +0000
Subject: [PATCH] Rename llvm::Optional<T>::Reset to 'reset' as per LLVM naming
 conventions.

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    | 6 +++---
 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 cc6065c062a..e55ad797c2c 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 8bdea45c5a9..6fd8bbaf096 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);