Revert to dumb pointers for compatibility within line info interfaces…

…, but add Ptr/ConstPtr typedefs.
dyninst · Oct 31, 2016 · 6e525f6 · 6e525f6
1 parent 72932b7
commit 6e525f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/dyninstAPI/h/BPatch_statement.h b/dyninstAPI/h/BPatch_statement.h
@@ -32,16 +32,9 @@
 #define _BPATCH_STATEMENT_H_
 
 #include "BPatch_dll.h"
-#include <boost/shared_ptr.hpp>
-
+#include "Module.h"
 class BPatch_module;
 
-namespace Dyninst {
-namespace SymtabAPI {
-	class Statement;
-    typedef boost::shared_ptr<const Statement> StatementConstPtr;
-}
-}
 
 class BPATCH_DLL_EXPORT BPatch_statement
 {
@@ -81,10 +74,10 @@ class BPATCH_DLL_EXPORT BPatch_statement
   private:
 
     //  Full parameter ctor -- can only built by friend classes
-    BPatch_statement(BPatch_module *mod,  Dyninst::SymtabAPI::StatementConstPtr s);
+    BPatch_statement(BPatch_module *mod,  Dyninst::SymtabAPI::Statement::ConstPtr s);
 
     BPatch_module *module_;
-	Dyninst::SymtabAPI::StatementConstPtr statement;
+	Dyninst::SymtabAPI::Statement::ConstPtr statement;
 };
 
 #endif 

diff --git a/symtabAPI/h/Module.h b/symtabAPI/h/Module.h
@@ -109,8 +109,10 @@ class SYMTAB_EXPORT Statement : public AddressRange
     struct line_info {};
     struct upper_bound {};
 
-    typedef boost::shared_ptr<Statement> Ptr;
-    typedef boost::shared_ptr<const Statement> ConstPtr;
+    typedef Statement* Ptr;
+    typedef const Statement* ConstPtr;
+//    typedef boost::shared_ptr<Statement> Ptr;
+//    typedef boost::shared_ptr<const Statement> ConstPtr;
 
 };
 template <typename OS>