Move SharingPtr.h into include/.

llvm-svn: 105896

3 files changed, 5 insertions, 3 deletions

diff --git a/lldb/source/Utility/SharingPtr.h b/lldb/include/lldb/Utility/SharingPtr.h
index f74786921e9..7d807b02c78 100644
--- a/lldb/source/Utility/SharingPtr.h
+++ b/lldb/include/lldb/Utility/SharingPtr.h
@@ -11,6 +11,7 @@
 #define utility_SharingPtr_h_
 
 #include <algorithm>
+#include <memory>
 
 namespace lldb {
 
@@ -67,6 +68,7 @@ private:
     element_type*      ptr_;
     imp::shared_count* cntrl_;
 
+    struct nat {int for_bool_;};
 public:
     SharingPtr();
     template<class Y> explicit SharingPtr(Y* p);
@@ -90,7 +92,7 @@ public:
     long use_count() const {return cntrl_ ? cntrl_->use_count() : 0;}
     bool unique() const {return use_count() == 1;}
     bool empty() const {return cntrl_ == 0;}
-    operator void*() const { return get(); }
+    operator nat*() const {return (nat*)get();}
 
 private:
 
diff --git a/lldb/include/lldb/lldb-types.h b/lldb/include/lldb/lldb-types.h
index 12a4f48c642..90f98fb1085 100644
--- a/lldb/include/lldb/lldb-types.h
+++ b/lldb/include/lldb/lldb-types.h
@@ -26,7 +26,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include "SharingPtr.h"
+#include "lldb/Utility/SharingPtr.h"
 
 //----------------------------------------------------------------------
 // All host systems must define:
diff --git a/lldb/source/Utility/SharingPtr.cpp b/lldb/source/Utility/SharingPtr.cpp
index 431fdc1b900..ab202ca5e5b 100644
--- a/lldb/source/Utility/SharingPtr.cpp
+++ b/lldb/source/Utility/SharingPtr.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SharingPtr.h"
+#include "lldb/Utility/SharingPtr.h"
 
 namespace lldb {