Revert "Revert "[ptr-traits] Implement the base pointer traits using the actual""

[oota-llvm.git] / include / llvm / Support / ErrorOr.h

diff --git a/include/llvm/Support/ErrorOr.h b/include/llvm/Support/ErrorOr.h
index 5021468b4da97bf19a1ef1172b415f536c885b78..ca6ede73e8df1315d6eb7da25569123127e208ff 100644 (file)
--- a/include/llvm/Support/ErrorOr.h
+++ b/include/llvm/Support/ErrorOr.h
@@ -184,17 +184,13 @@ public:
     return toPointer(getStorage());
   }
 
-  const_pointer operator ->() const {
-    return toPointer(getStorage());
-  }
+  const_pointer operator->() const { return toPointer(getStorage()); }
 
   reference operator *() {
     return *getStorage();
   }
 
-  const_reference operator *() const {
-    return *getStorage();
-  }
+  const_reference operator*() const { return *getStorage(); }
 
 private:
   template <class OtherT>
@@ -255,18 +251,13 @@ private:
     return Val;
   }
 
-  const_pointer toPointer(const_pointer Val) const {
-    return Val;
-  }
+  const_pointer toPointer(const_pointer Val) const { return Val; }
 
   pointer toPointer(wrap *Val) {
     return &Val->get();
   }
 
-  const_pointer toPointer(const wrap *Val) const {
-    return &Val->get();
-  }
-
+  const_pointer toPointer(const wrap *Val) const { return &Val->get(); }
 
   storage_type *getStorage() {
     assert(!HasError && "Cannot get value when an error exists!");