Skip to content
Snippets Groups Projects
Commit 02cd36ae authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Fix bug (null pointers)

parent 27f76d69
No related branches found
No related tags found
No related merge requests found
...@@ -84,7 +84,7 @@ namespace hpp { ...@@ -84,7 +84,7 @@ namespace hpp {
std::ostream& print (std::ostream& os) const; std::ostream& print (std::ostream& os) const;
private: private:
StateWkPtr_t state_; StatePtr_t state_;
typedef std::list <RoadmapNodePtr_t> RoadmapNodes_t; typedef std::list <RoadmapNodePtr_t> RoadmapNodes_t;
RoadmapNodes_t roadmapNodes_; RoadmapNodes_t roadmapNodes_;
...@@ -195,7 +195,7 @@ namespace hpp { ...@@ -195,7 +195,7 @@ namespace hpp {
private: private:
/// The constraint graph /// The constraint graph
graph::GraphWkPtr_t graph_; graph::GraphPtr_t graph_;
}; };
typedef StateHistogram NodeHistogram HPP_MANIPULATION_DEPRECATED; typedef StateHistogram NodeHistogram HPP_MANIPULATION_DEPRECATED;
typedef boost::shared_ptr <StateHistogram> NodeHistogramPtr_t; typedef boost::shared_ptr <StateHistogram> NodeHistogramPtr_t;
......
...@@ -99,14 +99,14 @@ namespace hpp { ...@@ -99,14 +99,14 @@ namespace hpp {
SymbolicComponentPtr_t symbolicComponent () const SymbolicComponentPtr_t symbolicComponent () const
{ {
return symbolicCC_.lock(); return symbolicCC_;
} }
private: private:
CachingSystem cacheSystem_; CachingSystem cacheSystem_;
graph::StateWkPtr_t state_; graph::StateWkPtr_t state_;
SymbolicComponentWkPtr_t symbolicCC_; SymbolicComponentPtr_t symbolicCC_;
}; };
} // namespace manipulation } // namespace manipulation
} // namespace hpp } // namespace hpp
......
...@@ -119,7 +119,7 @@ namespace hpp { ...@@ -119,7 +119,7 @@ namespace hpp {
const StatePtr_t& NodeBin::state () const const StatePtr_t& NodeBin::state () const
{ {
return state_.lock(); return state_;
} }
std::ostream& NodeBin::print (std::ostream& os) const std::ostream& NodeBin::print (std::ostream& os) const
...@@ -213,7 +213,7 @@ namespace hpp { ...@@ -213,7 +213,7 @@ namespace hpp {
const graph::GraphPtr_t& StateHistogram::constraintGraph () const const graph::GraphPtr_t& StateHistogram::constraintGraph () const
{ {
return graph_.lock(); return graph_;
} }
HistogramPtr_t StateHistogram::clone () const HistogramPtr_t StateHistogram::clone () const
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment