Make DISABLE_SMART_POINTERS work, again

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70443 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 8 insertions, 1 deletions

diff --git a/include/clang/Parse/Ownership.h b/include/clang/Parse/Ownership.h
index 652fc46505..54c04c2c4d 100644
--- a/include/clang/Parse/Ownership.h
+++ b/include/clang/Parse/Ownership.h
@@ -379,6 +379,12 @@ namespace clang {
       return Node;
     }
 
+    /// Take outside ownership of the raw pointer and cast it down.
+    template<typename T>
+    T *takeAs() {
+      return static_cast<T*>(Node);
+    }
+
     /// Alias for interface familiarity with unique_ptr.
     void * release() {
       return take();
@@ -698,8 +704,9 @@ namespace clang {
     unsigned size() const { return Count; }
 
     void reset(void **args, bool *argIsType, unsigned count) {
+#if !defined(DISABLE_SMART_POINTERS)
       destroy();
-
+#endif
       Args = args;
       ArgIsType = argIsType;
       Count = count;