7 files changed, 36 insertions, 40 deletions
diff --git a/lldb/include/lldb/API/SBType.h b/lldb/include/lldb/API/SBType.h
index b4ee97b2ca4..4517e702b86 100644
--- a/lldb/include/lldb/API/SBType.h
+++ b/lldb/include/lldb/API/SBType.h
@@ -167,6 +167,9 @@ protected:
     const lldb_private::TypeImpl &
     ref () const;
     
+    lldb::TypeImplSP
+    GetSP ();
+
     void
     SetSP (const lldb::TypeImplSP &type_impl_sp);
 #endif
diff --git a/lldb/include/lldb/API/SBValue.h b/lldb/include/lldb/API/SBValue.h
index 3abd8a8f97e..6c01a544ffa 100644
--- a/lldb/include/lldb/API/SBValue.h
+++ b/lldb/include/lldb/API/SBValue.h
@@ -355,27 +355,13 @@ protected:
     friend class SBValueList;
     friend class SBFrame;
 
-#ifndef SWIG
-    // Mimic shared pointer...
-    lldb_private::ValueObject *
-    get() const;
-
-    lldb_private::ValueObject *
-    operator->() const;
-
-    lldb::ValueObjectSP &
-    operator*();
-
-    const lldb::ValueObjectSP &
-    operator*() const;
-
-#endif
-
+    lldb::ValueObjectSP
+    GetSP () const;
+    
+    void
+    SetSP (const lldb::ValueObjectSP &sp);
+    
 private:
-    // Helper function for SBValue::Watch() and SBValue::WatchPointee().
-    lldb::SBWatchpoint
-    WatchValue(bool read, bool write, bool watch_pointee);
-
     lldb::ValueObjectSP m_opaque_sp;
 };
 
diff --git a/lldb/include/lldb/API/SBWatchpoint.h b/lldb/include/lldb/API/SBWatchpoint.h
index 539dc4147fa..d4f8d21a220 100644
--- a/lldb/include/lldb/API/SBWatchpoint.h
+++ b/lldb/include/lldb/API/SBWatchpoint.h
@@ -22,12 +22,12 @@ public:
 
     SBWatchpoint (const lldb::SBWatchpoint &rhs);
 
+    SBWatchpoint (const lldb::WatchpointSP &wp_sp);
+
     ~SBWatchpoint ();
 
-#ifndef SWIG
     const lldb::SBWatchpoint &
     operator = (const lldb::SBWatchpoint &rhs);
-#endif
 
     bool
     IsValid() const;
@@ -72,27 +72,20 @@ public:
     bool
     GetDescription (lldb::SBStream &description, DescriptionLevel level);
 
-#ifndef SWIG
-    SBWatchpoint (const lldb::WatchpointSP &wp_sp);
-#endif
+    void
+    Clear ();
+
+    lldb::WatchpointSP
+    GetSP () const;
+
+    void
+    SetSP (const lldb::WatchpointSP &sp);
 
 private:
     friend class SBTarget;
     friend class SBValue;
 
-#ifndef SWIG
-
-    lldb_private::Watchpoint *
-    operator->();
-
-    lldb_private::Watchpoint *
-    get();
-
-    lldb::WatchpointSP &
-    operator *();
-
-#endif
-
+    
     lldb::WatchpointSP m_opaque_sp;
 
 };
diff --git a/lldb/include/lldb/Core/ValueObject.h b/lldb/include/lldb/Core/ValueObject.h
index 102cd6349e9..9307cce70d2 100644
--- a/lldb/include/lldb/Core/ValueObject.h
+++ b/lldb/include/lldb/Core/ValueObject.h
@@ -518,6 +518,9 @@ public:
     virtual ConstString
     GetTypeName() = 0;
 
+    //------------------------------------------------------------------
+    // Sublasses can implement the functions below.
+    //------------------------------------------------------------------
     virtual lldb::LanguageType
     GetObjectRuntimeLanguage();
 
@@ -632,6 +635,10 @@ public:
             return m_parent->GetModule();
         return NULL;
     }
+    
+    virtual bool
+    GetDeclaration (Declaration &decl);
+
     //------------------------------------------------------------------
     // The functions below should NOT be modified by sublasses
     //------------------------------------------------------------------
diff --git a/lldb/include/lldb/Core/ValueObjectDynamicValue.h b/lldb/include/lldb/Core/ValueObjectDynamicValue.h
index 00b629ddd09..361599a91fd 100644
--- a/lldb/include/lldb/Core/ValueObjectDynamicValue.h
+++ b/lldb/include/lldb/Core/ValueObjectDynamicValue.h
@@ -22,6 +22,11 @@ namespace lldb_private {
     class ValueObjectCast : public ValueObject
     {
     public:
+        static lldb::ValueObjectSP
+        Create (ValueObject &parent, 
+                const ConstString &name, 
+                const ClangASTType &cast_type);
+
         virtual
         ~ValueObjectCast();
         
@@ -83,7 +88,6 @@ namespace lldb_private {
         ClangASTType m_cast_type;
         
     private:
-        friend class ValueObject;
         ValueObjectCast (ValueObject &parent, 
                          const ConstString &name, 
                          const ClangASTType &cast_type);
diff --git a/lldb/include/lldb/Core/ValueObjectVariable.h b/lldb/include/lldb/Core/ValueObjectVariable.h
index 575d37ae1b3..20c9589ceca 100644
--- a/lldb/include/lldb/Core/ValueObjectVariable.h
+++ b/lldb/include/lldb/Core/ValueObjectVariable.h
@@ -58,6 +58,9 @@ public:
     virtual SymbolContextScope *
     GetSymbolContextScope();
 
+    virtual bool
+    GetDeclaration (Declaration &decl);
+
 protected:
     virtual bool
     UpdateValue ();
diff --git a/lldb/include/lldb/Symbol/ClangASTType.h b/lldb/include/lldb/Symbol/ClangASTType.h
index 800accc7101..dd6e3657155 100644
--- a/lldb/include/lldb/Symbol/ClangASTType.h
+++ b/lldb/include/lldb/Symbol/ClangASTType.h
@@ -301,7 +301,7 @@ public:
 						 uint32_t& stride);
     
     lldb::clang_type_t
-    GetPointerType ();
+    GetPointerType () const;
     
     static lldb::clang_type_t
     GetPointerType (clang::ASTContext *ast_context,